Added /god back in.

plugin.yml

@@ -9,50 +9,29 @@ commands:
         description: Re-enables fire spread if he has been disabled with /stopfire
         usage: /<command>
     god:
-        description: Toggles god mode
+        description: Enable god mode
-        usage: /<command> [other player]
+        usage: /<command> [player]
+    ungod:
+        description: Disable god mode
+        usage: /<command> [player]
     heal:
         description: Heal yourself or another
-        usage: /<command> [other player]
+        usage: /<command> [player]
     slay:
         description: Slay yourself or another
-        usage: /<command> [other player]
+        usage: /<command> [player]
     stack:
         description: Stacks items in the player's inventory
         usage: /<command>
         aliases: ;
     region:
         description: Adjust protected regions
-        usage: /<command> <define|claim|setparent|flag|delete|info|addowner|removeowner|addmember|removemember|list|save|load|priority> ...
+        usage: /<command> <action> ...
         aliases: [rg, regions]
-    rd:
-        description: Alias for /region define
-        usage: same as /region define  
-    rc:
-        description: Alias for /region claim
-        usage: same as /region claim
-    rf:
-        description: Alias for /region flag
-        usage: same as /region flag
-    ri:
-        description: Alias for /region info
-        usage: same as /region info
-    rlist:
-        description: Alias for /region list
-        usage: same as /region list
-    rp:
-        description: Alias for /region priority
-        usage: same as /region priority
     locate:
         description: Set your compass towards a person
         usage: /<command> <target>
-    reloadwg:
+    worldguard:
-        description: Reload WorldGuard's configuration
+        description: WorldGuard commands
-        usage: /<command>
+        aliases: wg
-    tpregion:
+        usage: /<command>
-        description: Ports you to the region
-        usage: /<command> <region id> ...
-        aliases: tpr
-    buyregion:
-        description: Buy a buyable region
-        usage: /<command> <region id> [info]

src/com/sk89q/worldguard/bukkit/ConfigurationManager.java

@@ -22,8 +22,11 @@
 import com.sk89q.worldguard.blacklist.Blacklist;
 import java.io.File;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import org.bukkit.World;
+import org.bukkit.entity.Player;
 import org.bukkit.util.config.Configuration;
 
 /**
@@ -45,6 +48,16 @@ public class ConfigurationManager {
      */
     private Map<String, WorldConfiguration> worlds;
     
+    /**
+     * List of people with god mode.
+     */
+    private Set<String> hasGodMode = new HashSet<String>();
+    
+    /**
+     * List of people who can breathe underwater.
+     */
+    private Set<String> hasAmphibious = new HashSet<String>();
+    
     public boolean suppressTickSyncWarnings;
 
     /**
@@ -116,7 +129,65 @@ public void forgetPlayer(LocalPlayer player) {
             if (bl != null) {
                 bl.forgetPlayer(player);
             }
-            
         }
+        
+        hasGodMode.remove(player.getName());
+        hasAmphibious.remove(player.getName());
+    }
+    
+    /**
+     * Enable god mode for a player.
+     * 
+     * @param player
+     */
+    public void enableGodMode(Player player) {
+        hasGodMode.add(player.getName());
+    }
+    
+    /**
+     * Disable god mode for a player.
+     * 
+     * @param player
+     */
+    public void disableGodMode(Player player) {
+        hasGodMode.remove(player.getName());
+    }
+    
+    /**
+     * Check to see if god mode is enabled for a player.
+     * 
+     * @param player
+     * @return 
+     */
+    public boolean hasGodMode(Player player) {
+        return hasGodMode.contains(player.getName());
+    }
+    
+    /**
+     * Enable amphibious mode for a player.
+     * 
+     * @param player
+     */
+    public void enableAmphibiousMode(Player player) {
+        hasAmphibious.add(player.getName());
+    }
+    
+    /**
+     * Disable amphibious mode  for a player.
+     * 
+     * @param player
+     */
+    public void disableAmphibiousMode(Player player) {
+        hasAmphibious.remove(player.getName());
+    }
+    
+    /**
+     * Check to see if amphibious mode  is enabled for a player.
+     * 
+     * @param player
+     * @return 
+     */
+    public boolean hasAmphibiousMode(Player player) {
+        return hasAmphibious.contains(player.getName());
     }
 }

src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java

@@ -33,6 +33,7 @@
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.TickSyncDelayLoggerFilter;
+import com.sk89q.worldguard.bukkit.commands.GeneralCommands;
 import com.sk89q.worldguard.bukkit.commands.ProtectionCommands;
 import com.sk89q.worldguard.bukkit.commands.ToggleCommands;
 import com.sk89q.worldguard.protection.*;
@@ -96,6 +97,7 @@ public boolean hasPermission(CommandSender player, String perm) {
         // Register command classes
         commands.register(ToggleCommands.class);
         commands.register(ProtectionCommands.class);
+        commands.register(GeneralCommands.class);
     }
     
     /**

src/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java

@@ -0,0 +1,126 @@
+// $Id$
+/*
+ * WorldGuard
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldguard.bukkit.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.worldguard.bukkit.ConfigurationManager;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+
+public class GeneralCommands {
+    
+    @Command(aliases = {"god"},
+            usage = "[player]",
+            desc = "Enable godmode on a player",
+            flags = "", min = 0, max = 1)
+    public static void god(CommandContext args, WorldGuardPlugin plugin,
+            CommandSender sender) throws CommandException {
+        ConfigurationManager config = plugin.getGlobalConfiguration();
+        
+        Iterable<Player> targets = null;
+        boolean included = false;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god");
+        } else if (args.argsLength() == 1) {            
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god.other");
+        }
+
+        for (Player player : targets) {
+            config.enableGodMode(player);
+            
+            // Tell the user
+            if (player.equals(sender)) {
+                player.sendMessage(ChatColor.YELLOW + "God mode enabled!");
+                
+                // Keep track of this
+                included = true;
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "God enabled by "
+                        + plugin.toName(sender) + ".");
+                
+            }
+        }
+        
+        // The player didn't receive any items, then we need to send the
+        // user a message so s/he know that something is indeed working
+        if (!included && args.hasFlag('s')) {
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Players now have god mode.");
+        }
+    }
+    
+    @Command(aliases = {"ungod"},
+            usage = "[player]",
+            desc = "Disable godmode on a player",
+            flags = "", min = 0, max = 1)
+    public static void ungod(CommandContext args, WorldGuardPlugin plugin,
+            CommandSender sender) throws CommandException {
+        ConfigurationManager config = plugin.getGlobalConfiguration();
+        
+        Iterable<Player> targets = null;
+        boolean included = false;
+        
+        // Detect arguments based on the number of arguments provided
+        if (args.argsLength() == 0) {
+            targets = plugin.matchPlayers(plugin.checkPlayer(sender));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god");
+        } else if (args.argsLength() == 1) {            
+            targets = plugin.matchPlayers(sender, args.getString(0));
+            
+            // Check permissions!
+            plugin.checkPermission(sender, "worldguard.god.other");
+        }
+
+        for (Player player : targets) {
+            config.disableGodMode(player);
+            
+            // Tell the user
+            if (player.equals(sender)) {
+                player.sendMessage(ChatColor.YELLOW + "God mode disabled!");
+                
+                // Keep track of this
+                included = true;
+            } else {
+                player.sendMessage(ChatColor.YELLOW + "God disabled by "
+                        + plugin.toName(sender) + ".");
+                
+            }
+        }
+        
+        // The player didn't receive any items, then we need to send the
+        // user a message so s/he know that something is indeed working
+        if (!included && args.hasFlag('s')) {
+            sender.sendMessage(ChatColor.YELLOW.toString() + "Players now have god mode.");
+        }
+    }
+}