Implement wg("__global__").

NerdNu · Mar 26, 2021 · cf81133 · cf81133
1 parent a57102a
commit cf81133
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/nu/nerd/beastmaster/zones/ZonePredicate.java b/src/nu/nerd/beastmaster/zones/ZonePredicate.java
@@ -150,15 +150,21 @@ public boolean matches(Location loc, List<Object> args) {
                     // applicableRegions does NOT include the global region.
                     ApplicableRegionSet applicableRegions = regionManager.getApplicableRegions(weLoc.toVector().toBlockPoint());
                     String name = (String) args.get(0);
-                    if (name.equals("*") && applicableRegions.size() != 0) {
-                        // Any (non-global) region will do.
-                        return true;
-                    }
-
-                    for (ProtectedRegion region : applicableRegions) {
-                        if (name.equals(region.getId())) {
+                    if (applicableRegions.size() == 0) {
+                        if (name.equalsIgnoreCase("__global__")) {
+                            return true;
+                        }
+                    } else { // There are non-global regions.
+                        if (name.equals("*")) {
+                            // Any (non-global) region will do.
                             return true;
                         }
+
+                        for (ProtectedRegion region : applicableRegions) {
+                            if (name.equals(region.getId())) {
+                                return true;
+                            }
+                        }
                     }
                 }
                 return false;