Add removeInheritiedPermissions to properly remove trusted players in subclaims on /rsc

Author: castledking

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.griefprevention</groupId>
     <artifactId>GriefPrevention</artifactId>
-    <version>17.1.9</version>
+    <version>17.2.0</version>
 
     <name>GriefPrevention</name>
     <description>The official self-service anti-griefing Bukkit plugin for Minecraft servers since 2011.</description>

src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java

@@ -1876,6 +1876,7 @@ else if (cmd.getName().equalsIgnoreCase("restrictsubclaim") && player != null) {
                 claim.setSubclaimRestrictions(false);
                 GriefPrevention.sendMessage(player, TextMode.Success, Messages.SubclaimUnrestricted);
             } else {
+                removeInheritedPermissions(claim);
                 claim.setSubclaimRestrictions(true);
                 GriefPrevention.sendMessage(player, TextMode.Success, Messages.SubclaimRestricted);
             }
@@ -4141,6 +4142,7 @@ public boolean handleRestrictSubclaimCommand(CommandSender sender, String[] args
             claim.setSubclaimRestrictions(false);
             GriefPrevention.sendMessage(player, TextMode.Success, Messages.SubclaimUnrestricted);
         } else {
+            removeInheritedPermissions(claim);
             claim.setSubclaimRestrictions(true);
             GriefPrevention.sendMessage(player, TextMode.Success, Messages.SubclaimRestricted);
         }
@@ -4149,6 +4151,47 @@ public boolean handleRestrictSubclaimCommand(CommandSender sender, String[] args
         return true;
     }
 
+    private void removeInheritedPermissions(Claim claim) {
+        if (claim.parent == null) return;
+
+        ArrayList<String> parentBuilders = new ArrayList<>();
+        ArrayList<String> parentContainers = new ArrayList<>();
+        ArrayList<String> parentAccessors = new ArrayList<>();
+        ArrayList<String> parentManagers = new ArrayList<>();
+        claim.parent.getPermissions(parentBuilders, parentContainers, parentAccessors, parentManagers);
+
+        ArrayList<String> currentBuilders = new ArrayList<>();
+        ArrayList<String> currentContainers = new ArrayList<>();
+        ArrayList<String> currentAccessors = new ArrayList<>();
+        ArrayList<String> currentManagers = new ArrayList<>();
+        claim.getPermissions(currentBuilders, currentContainers, currentAccessors, currentManagers);
+
+        for (String manager : parentManagers) {
+            claim.managers.remove(manager.toLowerCase());
+        }
+
+        for (String builder : parentBuilders) {
+            ClaimPermission childPerm = claim.getPermission(builder.toLowerCase());
+            if (childPerm == ClaimPermission.Build) {
+                claim.dropPermission(builder);
+            }
+        }
+
+        for (String container : parentContainers) {
+            ClaimPermission childPerm = claim.getPermission(container.toLowerCase());
+            if (childPerm == ClaimPermission.Container) {
+                claim.dropPermission(container);
+            }
+        }
+
+        for (String accessor : parentAccessors) {
+            ClaimPermission childPerm = claim.getPermission(accessor.toLowerCase());
+            if (childPerm == ClaimPermission.Access) {
+                claim.dropPermission(accessor);
+            }
+        }
+    }
+
     public boolean handleDropsCommand(CommandSender sender, String[] args) {
         if (!(sender instanceof Player player))
             return false;