Revert "Add member inheritance for non-player associables"

This reverts commit b1cd130.
EngineHub · Jul 26, 2021 · 8efc2e6 · 8efc2e6
1 parent b1cd130
commit 8efc2e6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/...in/java/com/sk89q/worldguard/protection/association/AbstractRegionOverlapAssociation.java b/...in/java/com/sk89q/worldguard/protection/association/AbstractRegionOverlapAssociation.java
@@ -87,35 +87,31 @@ private boolean checkNonplayerProtectionDomains(Iterable<? extends ProtectedRegi
     public Association getAssociation(List<ProtectedRegion> regions) {
         checkNotNull(source);
         for (ProtectedRegion region : regions) {
-            while (region != null) {
-                if ((region.getId().equals(ProtectedRegion.GLOBAL_REGION) && source.isEmpty())) {
-                    return Association.OWNER;
-                }
+            if ((region.getId().equals(ProtectedRegion.GLOBAL_REGION) && source.isEmpty())) {
+                return Association.OWNER;
+            }
 
-                if (source.contains(region)) {
-                    if (useMaxPriorityAssociation) {
-                        int priority = region.getPriority();
-                        if (priority == maxPriority) {
-                            return Association.OWNER;
-                        }
-                    } else {
+            if (source.contains(region)) {
+                if (useMaxPriorityAssociation) {
+                    int priority = region.getPriority();
+                    if (priority == maxPriority) {
                         return Association.OWNER;
                     }
-                }
-
-                Set<ProtectedRegion> source;
-
-                if (useMaxPriorityAssociation) {
-                    source = maxPriorityRegions;
                 } else {
-                    source = this.source;
-                }
-
-                if (checkNonplayerProtectionDomains(source, region.getFlag(Flags.NONPLAYER_PROTECTION_DOMAINS))) {
                     return Association.OWNER;
                 }
+            }
+
+            Set<ProtectedRegion> source;
+
+            if (useMaxPriorityAssociation) {
+                source = maxPriorityRegions;
+            } else {
+                source = this.source;
+            }
 
-                region = region.getParent();
+            if (checkNonplayerProtectionDomains(source, region.getFlag(Flags.NONPLAYER_PROTECTION_DOMAINS))) {
+                return Association.OWNER;
             }
         }
 

diff --git a/worldguard-core/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java b/worldguard-core/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java
@@ -212,7 +212,7 @@ public void testNonPlayerBuildAccessInOneRegion(boolean useMaxPriorityAssociatio
         assertTrue(appl.testState(assoc, Flags.BUILD));
         // Inside fountain
         appl = manager.getApplicableRegions(inFountain);
-        assertTrue(appl.testState(assoc, Flags.BUILD));
+        assertFalse(appl.testState(assoc, Flags.BUILD));
     }
 
     @ParameterizedTest(name = "useMaxPriorityAssociation={0}")