diff --git a/pom.xml b/pom.xml index b327644..38ff62c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.goldtreeservers worldguardextraflags - 2.14.1 + 2.14.2 WorldGuardExtraFlags WorldGuardExtraFlagsPlugin diff --git a/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnExitFlag.java b/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnExitFlag.java index 60b210e..f2d7c28 100644 --- a/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnExitFlag.java +++ b/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/CommandOnExitFlag.java @@ -63,9 +63,9 @@ public class CommandOnExitFlag extends Handler } } - for(Set commands_ : commands) + for(Set commands_ : this.lastCommands) { - if (!this.lastCommands.contains(commands_)) + if (!commands.contains(commands_)) { boolean isOp = player.isOp(); diff --git a/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/ConsoleCommandOnExitFlag.java b/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/ConsoleCommandOnExitFlag.java index 9cb241f..1c51648 100644 --- a/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/ConsoleCommandOnExitFlag.java +++ b/src/main/java/net/goldtreeservers/worldguardextraflags/flags/handlers/ConsoleCommandOnExitFlag.java @@ -63,29 +63,18 @@ public class ConsoleCommandOnExitFlag extends Handler } } - boolean isOp = player.isOp(); - - try + for(Set commands_ : this.lastCommands) { - player.setOp(true); - - for(Set commands_ : commands) + if (!commands.contains(commands_)) { - if (!this.lastCommands.contains(commands_)) + for(String command : commands_) { - for(String command : commands_) - { - WorldGuardExtraFlagsPlugin.getPlugin().getServer().dispatchCommand(WorldGuardExtraFlagsPlugin.getPlugin().getServer().getConsoleSender(), command.substring(1).replace("%username%", player.getName())); //TODO: Make this better - } - - break; + WorldGuardExtraFlagsPlugin.getPlugin().getServer().dispatchCommand(WorldGuardExtraFlagsPlugin.getPlugin().getServer().getConsoleSender(), command.substring(1).replace("%username%", player.getName())); //TODO: Make this better } + + break; } } - finally - { - player.setOp(isOp); - } this.lastCommands = commands; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index af8baf1..1ddf27b 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: WorldGuardExtraFlags -version: 2.14.1 +version: 2.14.2 description: Adds more flags to worldguard to help manage your server easily! author: isokissa3 website: https://goldtreevers.net