Allow /rsc to be ran in main claims to restrict future subdivision permisions

- Add inheritNothingForNewSubdivisions field for claim data
- Allow /rsc to be ran in main claims, restricting their future subdivision permissions
- Add new MainClaimSubdivisionInheritDisabled and Enabled messages

Author: castledking

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>com.griefprevention</groupId>
     <artifactId>GriefPrevention</artifactId>
-    <version>17.2.0</version>
+    <version>17.2.1</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/Claim.java

@@ -95,6 +95,9 @@ public class Claim
 
      // intended for subclaims - they inherit no permissions
      private boolean inheritNothing = false;
+  
+     // for main claims - when true, future subdivisions will NOT inherit permissions
+     private boolean inheritNothingForNewSubdivisions = false;
 
      //children (subdivisions)
      //note subdivisions themselves never have children
@@ -262,6 +265,16 @@ public void setSubclaimRestrictions(boolean inheritNothing)
      {
          this.inheritNothing = inheritNothing;
      }
+     
+     public boolean getInheritNothingForNewSubdivisions()
+     {
+         return this.inheritNothingForNewSubdivisions;
+     }
+     
+     public void setInheritNothingForNewSubdivisions(boolean inheritNothingForNewSubdivisions)
+     {
+         this.inheritNothingForNewSubdivisions = inheritNothingForNewSubdivisions;
+     }
 
      //distance check for claims, distance in this case is a band around the outside of the claim rather then euclidean distance
      public boolean isNear(Location location, int howNear)

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

@@ -93,7 +93,7 @@ public abstract class DataStore {
     final static String bannedWordsFilePath = dataLayerFolderPath + File.separator + "bannedWords.txt";
 
     // the latest version of the data schema implemented here
-    protected static final int latestSchemaVersion = 5;
+    protected static final int latestSchemaVersion = 6;
 
     // reading and writing the schema version to the data store
     abstract int getSchemaVersionFromStorage();
@@ -1215,7 +1215,9 @@ synchronized public CreateClaimResult createClaim(World world, int x1, int x2, i
         if (parent != null) {
             // First-child subdivisions inherit from parent; nested subdivisions do not.
             boolean isNested = parent.parent != null;
-            newClaim.setSubclaimRestrictions(isNested);
+            // Also check if parent has inheritNothingForNewSubdivisions set
+            boolean parentRestrictsFutureSubdivisions = parent.getInheritNothingForNewSubdivisions();
+            newClaim.setSubclaimRestrictions(isNested || parentRestrictsFutureSubdivisions);
             claimsToCheck = newClaim.parent.children;
         } else {
             claimsToCheck = this.claims;

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

@@ -109,7 +109,7 @@ void initialize() throws Exception
         {
             //ensure the data tables exist
             statement.execute("CREATE TABLE IF NOT EXISTS griefprevention_nextclaimid (nextid INTEGER)");
-            statement.execute("CREATE TABLE IF NOT EXISTS griefprevention_claimdata (id INTEGER, owner VARCHAR(50), lessercorner VARCHAR(100), greatercorner VARCHAR(100), builders TEXT, containers TEXT, accessors TEXT, managers TEXT, inheritnothing BOOLEAN, parentid INTEGER, expiration BIGINT)");
+            statement.execute("CREATE TABLE IF NOT EXISTS griefprevention_claimdata (id INTEGER, owner VARCHAR(50), lessercorner VARCHAR(100), greatercorner VARCHAR(100), builders TEXT, containers TEXT, accessors TEXT, managers TEXT, inheritnothing BOOLEAN, parentid INTEGER, expiration BIGINT, explosivesallowed BOOLEAN, inheritnothingfornewsubdivisions BOOLEAN)");
             statement.execute("CREATE TABLE IF NOT EXISTS griefprevention_playerdata (name VARCHAR(50), lastlogin DATETIME, accruedblocks INTEGER, bonusblocks INTEGER)");
             statement.execute("CREATE TABLE IF NOT EXISTS griefprevention_schemaversion (version INTEGER)");
 
@@ -278,6 +278,12 @@ void initialize() throws Exception
             statement.execute(SQL_UPDATE_SCHEMA_ADD_EXPLOSIVES);
         }
 
+        if (this.getSchemaVersion() <= 5)
+        {
+            statement = this.databaseConnection.createStatement();
+            statement.execute("ALTER TABLE griefprevention_claimdata ADD inheritNothingForNewSubdivisions BOOLEAN DEFAULT 0 AFTER inheritNothing");
+        }
+
         //load claims data into memory
 
         results = statement.executeQuery("SELECT * FROM griefprevention_claimdata");
@@ -297,6 +303,7 @@ void initialize() throws Exception
                 long parentId = results.getLong("parentid");
                 claimID = results.getLong("id");
                 boolean inheritNothing = results.getBoolean("inheritnothing");
+                boolean inheritNothingForNewSubdivisions = results.getBoolean("inheritnothingfornewsubdivisions");
 
                 //expiration date
                 long expirationDate = results.getLong("expiration");
@@ -375,6 +382,7 @@ else if (this.getSchemaVersion() < 1)
                 Claim claim = new Claim(lesserBoundaryCorner, greaterBoundaryCorner, ownerID, builderNames, containerNames, accessorNames, managerNames, inheritNothing, claimID, false);
                 claim.setExpirationDate(expirationDate);
                 claim.areExplosivesAllowed = explosivesAllowed;
+                claim.setInheritNothingForNewSubdivisions(inheritNothingForNewSubdivisions);
 
                 if (removeClaim)
                 {
@@ -476,6 +484,7 @@ synchronized private void writeClaimData(Claim claim) throws SQLException
         String accessorsString = this.storageStringBuilder(accessors);
         String managersString = this.storageStringBuilder(managers);
         boolean inheritNothing = claim.getSubclaimRestrictions();
+        boolean inheritNothingForNewSubdivisions = claim.getInheritNothingForNewSubdivisions();
         long parentId = claim.parent == null ? -1 : claim.parent.id;
         long expirationDate = claim.getExpirationDate();
         boolean explosivesAllowed = claim.areExplosivesAllowed;
@@ -495,6 +504,7 @@ synchronized private void writeClaimData(Claim claim) throws SQLException
             insertStmt.setLong(10, parentId);
             insertStmt.setLong(11, expirationDate);
             insertStmt.setBoolean(12, explosivesAllowed);
+            insertStmt.setBoolean(13, inheritNothingForNewSubdivisions);
             insertStmt.executeUpdate();
         }
         catch (SQLException e)

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

@@ -554,6 +554,9 @@ Claim loadClaim(String input, ArrayList<Long> out_parentID, long lastModifiedDat
 
         boolean inheritNothing = yaml.getBoolean("inheritNothing");
 
+        // Load inheritNothingForNewSubdivisions setting (default false = inherit)
+        boolean inheritNothingForNewSubdivisions = yaml.getBoolean("inheritNothingForNewSubdivisions", false);
+
         out_parentID.add(yaml.getLong("Parent Claim ID", -1L));
 
         // Add is3D flag
@@ -567,6 +570,7 @@ Claim loadClaim(String input, ArrayList<Long> out_parentID, long lastModifiedDat
         claim.modifiedDate = new Date(lastModifiedDate);
         claim.id = claimID;
         claim.areExplosivesAllowed = explosivesAllowed;
+        claim.setInheritNothingForNewSubdivisions(inheritNothingForNewSubdivisions);
 
         ConfigurationSection childrenSection = yaml.getConfigurationSection("Children");
         if (childrenSection != null)
@@ -711,6 +715,7 @@ private void populateYamlForClaim(Claim claim, ConfigurationSection section)
 
         section.set("Parent Claim ID", claim.parent == null ? -1L : claim.parent.id);
         section.set("inheritNothing", claim.getSubclaimRestrictions());
+        section.set("inheritNothingForNewSubdivisions", claim.getInheritNothingForNewSubdivisions());
         section.set("Is3D", claim.is3D());
         section.set("Explosives Allowed", claim.areExplosivesAllowed);
         section.set("Modified Date", claim.modifiedDate != null ? claim.modifiedDate.getTime() : System.currentTimeMillis());

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

@@ -1859,11 +1859,31 @@ else if (cmd.getName().equalsIgnoreCase("permissiontrust") && player != null) {
         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 || claim.parent == null) {
+            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);
+                    GriefPrevention.sendMessage(player, TextMode.Success, Messages.MainClaimSubdivisionInheritEnabled);
+                } else {
+                    claim.setInheritNothingForNewSubdivisions(true);
+                    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
@@ -4133,11 +4153,32 @@ public boolean handleRestrictSubclaimCommand(CommandSender sender, String[] args
         PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
         Claim claim = this.dataStore.getClaimAt(player.getLocation(), true, playerData.lastClaim);
 
-        if (claim == null || claim.parent == null) {
+        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);
+                GriefPrevention.sendMessage(player, TextMode.Success, Messages.MainClaimSubdivisionInheritEnabled);
+            } else {
+                claim.setInheritNothingForNewSubdivisions(true);
+                GriefPrevention.sendMessage(player, TextMode.Success, Messages.MainClaimSubdivisionInheritDisabled);
+            }
+            this.dataStore.saveClaim(claim);
+            return true;
+        }
+
+        // Original logic for subdivisions
         if (claim.getSubclaimRestrictions()) {
             claim.setSubclaimRestrictions(false);
             GriefPrevention.sendMessage(player, TextMode.Success, Messages.SubclaimUnrestricted);

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

@@ -242,6 +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."),
     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."),