From 9c7fb6a1d35f37ace8eb36de79cf737d48b40912 Mon Sep 17 00:00:00 2001
From: "Luke Anderson (stuntguy3000)" <stuntguy3000@gmail.com>
Date: Sun, 26 Jan 2014 12:00:08 +1030
Subject: [PATCH] Changed halt-activity: Added Silent (s) and Information (i)
 flags, Added Resume (r) flag, remove c flag.

---
 .../bukkit/commands/ToggleCommands.java       | 78 ++++++++++++-------
 1 file changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java
index e03843f8..2540718c 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java
@@ -98,48 +98,68 @@ public void allowFire(CommandContext args, CommandSender sender) throws CommandE
     }
 
     @Command(aliases = {"halt-activity", "stoplag", "haltactivity"},
-            desc = "Attempts to cease as much activity in order to stop lag", flags = "c", max = 0)
+            desc = "Attempts to cease as much activity in order to stop lag", flags = "ris", max = 0)
     @CommandPermissions({"worldguard.halt-activity"})
     public void stopLag(CommandContext args, CommandSender sender) throws CommandException {
 
         ConfigurationManager configManager = plugin.getGlobalStateManager();
 
-        configManager.activityHaltToggle = !args.hasFlag('c');
-
-        if (configManager.activityHaltToggle) {
-            if (!(sender instanceof Player)) {
-                sender.sendMessage(ChatColor.YELLOW
-                        + "ALL intensive server activity halted.");
+        if (args.hasFlag('i')) {
+            if (configManager.activityHaltToggle) {
+                 sender.sendMessage(ChatColor.YELLOW
+                         + "ALL intensive server activity is not allowed.");
+            } else {
+                 sender.sendMessage(ChatColor.YELLOW
+                         + "ALL intensive server activity is allowed.");
             }
+        } else {
+            configManager.activityHaltToggle = !args.hasFlag('r');
 
-            plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                    + "ALL intensive server activity halted by "
-                    + plugin.toName(sender) + ".");
+            if (configManager.activityHaltToggle) {
+                if (!(sender instanceof Player)) {
+                    sender.sendMessage(ChatColor.YELLOW
+                            + "ALL intensive server activity halted.");
+                }
 
-            for (World world : plugin.getServer().getWorlds()) {
-                int removed = 0;
+                if (!args.hasFlag('s')) {
+                    plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                             + "ALL intensive server activity halted by "
+                             + plugin.toName(sender) + ".");
+                } else {
+                    sender.sendMessage(ChatColor.YELLOW
+                        + "(Silent) ALL intensive server activity halted by "
+                        + plugin.toName(sender) + ".");
+                }
 
-                for (Entity entity : world.getEntities()) {
-                    if (BukkitUtil.isIntensiveEntity(entity)) {
-                        entity.remove();
-                        removed++;
+                for (World world : plugin.getServer().getWorlds()) {
+                    int removed = 0;
+
+                    for (Entity entity : world.getEntities()) {
+                        if (BukkitUtil.isIntensiveEntity(entity)) {
+                            entity.remove();
+                            removed++;
+                        }
+                    }
+
+                    if (removed > 10) {
+                        sender.sendMessage("" + removed + " entities (>10) auto-removed from "
+                                + world.getName());
                     }
                 }
-
-                if (removed > 10) {
-                    sender.sendMessage("" + removed + " entities (>10) auto-removed from "
-                            + world.getName());
+            } else {
+                if (!args.hasFlag('s')) {
+                    plugin.getServer().broadcastMessage(ChatColor.YELLOW
+                            + "ALL intensive server activity is now allowed.");
+                    
+                    if (!(sender instanceof Player)) {
+                        sender.sendMessage(ChatColor.YELLOW
+                                + "ALL intensive server activity is now allowed.");
+                    }
+                } else {
+                    sender.sendMessage(ChatColor.YELLOW
+                            + "(Silent) ALL intensive server activity is now allowed.");
                 }
             }
-
-        } else {
-            if (!(sender instanceof Player)) {
-                sender.sendMessage(ChatColor.YELLOW
-                        + "ALL intensive server activity no longer halted.");
-            }
-
-            plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                    + "ALL intensive server activity is now allowed.");
         }
     }
 }