fix as_op silent

Because morph wasn't paying attention
DenizenScript · Jun 20, 2015 · bbf3289 · bbf3289
1 parent 47fdad6
commit bbf3289
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ExecuteCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/server/ExecuteCommand.java
@@ -105,12 +105,14 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
                 if (!pcpe.isCancelled()) {
                     boolean silentBool = silent.asBoolean();
                     Player player = ((BukkitScriptEntryData) scriptEntry.entryData).getPlayer().getPlayerEntity();
-                    if (silentBool)
+                    if (silentBool) {
                         silencedPlayers.add(player.getUniqueId());
+                    }
                     player.performCommand(pcpe.getMessage().startsWith("/") ?
                             pcpe.getMessage().substring(1) : pcpe.getMessage());
-                    if (silentBool)
+                    if (silentBool) {
                         silencedPlayers.remove(player.getUniqueId());
+                    }
                 }
             }
             catch (Throwable e) {
@@ -125,9 +127,18 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
             try {
                 PlayerCommandPreprocessEvent pcpe = new PlayerCommandPreprocessEvent(((BukkitScriptEntryData)scriptEntry.entryData).getPlayer().getPlayerEntity(), "/" + command);
                 Bukkit.getPluginManager().callEvent(pcpe);
-                if (!pcpe.isCancelled())
-                    ((BukkitScriptEntryData)scriptEntry.entryData).getPlayer().getPlayerEntity().performCommand(
-                            pcpe.getMessage().startsWith("/") ? pcpe.getMessage().substring(1): pcpe.getMessage());
+                if (!pcpe.isCancelled()) {
+                    boolean silentBool = silent.asBoolean();
+                    Player player = ((BukkitScriptEntryData) scriptEntry.entryData).getPlayer().getPlayerEntity();
+                    if (silentBool) {
+                        silencedPlayers.add(player.getUniqueId());
+                    }
+                    player.performCommand(pcpe.getMessage().startsWith("/") ?
+                            pcpe.getMessage().substring(1) : pcpe.getMessage());
+                    if (silentBool) {
+                        silencedPlayers.remove(player.getUniqueId());
+                    }
+                }
             }
             catch (Throwable e) {
                 dB.echoError(scriptEntry.getResidingQueue(), "Exception while executing command as OP.");