Fix /rsc to update existing subdivisions in main claims

Author: castledking

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

@@ -439,6 +439,7 @@ synchronized void addClaim(Claim newClaim, boolean writeToStorage) {
         this.claimIDMap.put(newClaim.id, newClaim);
         for (Claim child : newClaim.children) {
             this.claimIDMap.put(child.id, child);
+            child.inDataStore = true;
             // 3D subdivisions need to be in chunk claim map so getClaimAt can find them
             if (child.is3D()) {
                 addToChunkClaimMap(child);

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

@@ -423,10 +423,6 @@ else if (parentId == -1)
             childClaim.parent = topLevelClaim;
             topLevelClaim.children.add(childClaim);
             childClaim.inDataStore = true;
-            // Migration: first-child 3D subdivisions should inherit (inheritNothing=false)
-            if (childClaim.is3D() && childClaim.getSubclaimRestrictions() && topLevelClaim.parent == null) {
-                childClaim.setSubclaimRestrictions(false);
-            }
         }
 
         for (Claim claim : claimsToRemove)

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

@@ -626,10 +626,6 @@ private Claim deserializeChild(ConfigurationSection section, Claim parent, List<
 
         boolean inheritNothing = section.getBoolean("inheritNothing");
         boolean is3D = section.getBoolean("Is3D", false);
-        // Migration: first-child 3D subdivisions should inherit (inheritNothing=false)
-        if (is3D && inheritNothing && parent != null && parent.parent == null) {
-            inheritNothing = false;
-        }
         boolean explosivesAllowed = section.getBoolean("Explosives Allowed", false);
 
         Long childID = null;

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

@@ -1857,66 +1857,7 @@ else if (cmd.getName().equalsIgnoreCase("permissiontrust") && player != null) {
 
         // restrictsubclaim
         else if (cmd.getName().equalsIgnoreCase("restrictsubclaim") && player != null) {
-            PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
-            Claim claim = this.dataStore.getClaimAt(player.getLocation(), true, playerData.lastClaim);
-            if (claim == null) {
-                GriefPrevention.sendMessage(player, TextMode.Err, Messages.StandInSubclaim);
-                return true;
-            }
-
-            // If in a main claim (no parent), toggle the flag for future subdivisions
-            if (claim.parent == null) {
-                // If admin claim, fail if this user is not an admin
-                // If not an admin claim, fail if this user is not the owner
-                if (!playerData.ignoreClaims && (claim.isAdminClaim() ? !player.hasPermission("griefprevention.adminclaims") : !player.getUniqueId().equals(claim.ownerID))) {
-                    GriefPrevention.sendMessage(player, TextMode.Err, Messages.OnlyOwnersModifyClaims, claim.getOwnerName());
-                    return true;
-                }
-
-                if (claim.getInheritNothingForNewSubdivisions()) {
-                    claim.setInheritNothingForNewSubdivisions(false);
-                    // Also unrestrict all existing subdivisions
-                    for (Claim child : claim.children) {
-                        if (child.getSubclaimRestrictions()) {
-                            child.setSubclaimRestrictions(false);
-                            this.dataStore.saveClaim(child);
-                        }
-                    }
-                    GriefPrevention.sendMessage(player, TextMode.Success, Messages.MainClaimSubdivisionInheritEnabled);
-                } else {
-                    claim.setInheritNothingForNewSubdivisions(true);
-                    // Also restrict all existing subdivisions
-                    for (Claim child : claim.children) {
-                        if (!child.getSubclaimRestrictions()) {
-                            removeInheritedPermissions(child);
-                            child.setSubclaimRestrictions(true);
-                            this.dataStore.saveClaim(child);
-                        }
-                    }
-                    GriefPrevention.sendMessage(player, TextMode.Success, Messages.MainClaimSubdivisionInheritDisabled);
-                }
-                this.dataStore.saveClaim(claim);
-                return true;
-            }
-
-            // If player has /ignoreclaims on, continue
-            // If admin claim, fail if this user is not an admin
-            // If not an admin claim, fail if this user is not the owner
-            if (!playerData.ignoreClaims && (claim.isAdminClaim() ? !player.hasPermission("griefprevention.adminclaims") : !player.getUniqueId().equals(claim.parent.ownerID))) {
-                GriefPrevention.sendMessage(player, TextMode.Err, Messages.OnlyOwnersModifyClaims, claim.getOwnerName());
-                return true;
-            }
-
-            if (claim.getSubclaimRestrictions()) {
-                claim.setSubclaimRestrictions(false);
-                GriefPrevention.sendMessage(player, TextMode.Success, Messages.SubclaimUnrestricted);
-            } else {
-                removeInheritedPermissions(claim);
-                claim.setSubclaimRestrictions(true);
-                GriefPrevention.sendMessage(player, TextMode.Success, Messages.SubclaimRestricted);
-            }
-            this.dataStore.saveClaim(claim);
-            return true;
+            return this.handleRestrictSubclaimCommand(player, new String[]{});
         }
 
         // adminclaims
@@ -4184,9 +4125,20 @@ public boolean handleRestrictSubclaimCommand(CommandSender sender, String[] args
 
             if (claim.getInheritNothingForNewSubdivisions()) {
                 claim.setInheritNothingForNewSubdivisions(false);
+                // Also unrestrict all existing subdivisions
+                for (Claim child : claim.children) {
+                    child.setSubclaimRestrictions(false);
+                }
                 GriefPrevention.sendMessage(player, TextMode.Success, Messages.MainClaimSubdivisionInheritEnabled);
             } else {
                 claim.setInheritNothingForNewSubdivisions(true);
+                // Also restrict all existing subdivisions
+                for (Claim child : claim.children) {
+                    if (!child.getSubclaimRestrictions()) {
+                        removeInheritedPermissions(child);
+                    }
+                    child.setSubclaimRestrictions(true);
+                }
                 GriefPrevention.sendMessage(player, TextMode.Success, Messages.MainClaimSubdivisionInheritDisabled);
             }
             this.dataStore.saveClaim(claim);

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

@@ -242,8 +242,8 @@ public enum Messages
     StandInSubclaim("You need to be standing in a subclaim to restrict it"),
     SubclaimRestricted("This subclaim's permissions will no longer inherit from the parent claim"),
     SubclaimUnrestricted("This subclaim's permissions will now inherit from the parent claim"),
-    MainClaimSubdivisionInheritDisabled("Future subdivisions in this claim will NOT inherit permissions."),
-    MainClaimSubdivisionInheritEnabled("Future subdivisions in this claim will inherit permissions."),
+    MainClaimSubdivisionInheritDisabled("All subdivisions in this claim will NOT inherit permissions."),
+    MainClaimSubdivisionInheritEnabled("All subdivisions in this claim will inherit permissions."),
     NetherPortalTrapDetectionMessage("It seems you might be stuck inside a nether portal. We will rescue you in a few seconds if that is the case!", "Sent to player on join, if they left while inside a nether portal."),
     ClaimHelpHeader("Available /claim commands:"),
     ClaimHelpLegend("<> - Required, [] - Optional."),