Bugfixes. Allowed/blocked commands should now respect global flags. Region invincibility/godmode compatibility should now work instead of throwing NPEs.

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java

@@ -768,8 +768,8 @@ public void onEntityRegainHealth(EntityRegainHealthEvent event) {
 
     /**
      * Check if a player is invincible, via either god mode or region flag. If
-     * the region denies invincibility, the player must have the another
+     * the region denies invincibility, the player must have an extra permission
-     * permission to override it.
+     * to override it. (worldguard.god.override-regions)
      * 
      * @param player
      * @return
@@ -779,13 +779,19 @@ private boolean isInvincible(Player player) {
         WorldConfiguration wcfg = cfg.get(player.getWorld());
 
         boolean god = cfg.hasGodMode(player);
-        Boolean allowed = wcfg.useRegions && RegionQueryUtil.isAllowedInvinciblity(plugin, player);
+        if (wcfg.useRegions) {
-        if (allowed == false && wcfg.useRegions) {
+            Boolean flag = RegionQueryUtil.isAllowedInvinciblity(plugin, player);
-            return god && plugin.hasPermission(player, "worldguard.god.override-regions");
+            boolean allowed = flag == null || flag == true;
-        } else if (allowed == true || !wcfg.useRegions) {
+            boolean invincible = RegionQueryUtil.isInvincible(plugin, player);
-            return god;
+
+            if (allowed) {
+                return god || invincible;
+            } else {
+                return (god && plugin.hasPermission(player, "worldguard.god.override-regions"))
+                    || invincible;
+            }
         } else {
-            return RegionQueryUtil.isInvincible(plugin, player);
+            return god;
         }
     }
 }

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java

@@ -1007,17 +1007,25 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
             Vector pt = toVector(player.getLocation());
             RegionManager mgr = plugin.getGlobalRegionManager().get(world);
             ApplicableRegionSet set = mgr.getApplicableRegions(pt);
+            ProtectedRegion globalRegion = mgr.getRegion("__global__");
 
             String[] parts = event.getMessage().split(" ");
 
             Set<String> allowedCommands = set.getFlag(DefaultFlag.ALLOWED_CMDS);
+            if (allowedCommands == null && globalRegion != null) {
+                allowedCommands = globalRegion.getFlag(DefaultFlag.ALLOWED_CMDS);
+            }
             if (allowedCommands != null && !allowedCommands.contains(parts[0].toLowerCase())) {
+
                 player.sendMessage(ChatColor.RED + parts[0].toLowerCase() + " is not allowed in this area.");
                 event.setCancelled(true);
                 return;
             }
 
             Set<String> blockedCommands = set.getFlag(DefaultFlag.BLOCKED_CMDS);
+            if (blockedCommands == null && globalRegion != null) {
+                blockedCommands = globalRegion.getFlag(DefaultFlag.BLOCKED_CMDS);
+            }
             if (blockedCommands != null && blockedCommands.contains(parts[0].toLowerCase())) {
                 player.sendMessage(ChatColor.RED + parts[0].toLowerCase() + " is blocked in this area.");
                 event.setCancelled(true);

src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java

@@ -309,9 +309,11 @@ private void clearParents(Set<ProtectedRegion> needsClear,
      * @throws IllegalArgumentException if a StateFlag is given
      */
     public <T extends Flag<V>, V> V getFlag(T flag) {
+        /*
         if (flag instanceof StateFlag) {
             throw new IllegalArgumentException("Cannot use StateFlag with getFlag()");
         }
+        */
 
         int lastPriority = 0;
         boolean found = false;