Bugfixes & Improvements (17.0.6)

Author: castledking

pom.xml

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

src/main/java/com/griefprevention/visualization/impl/SnapOverrideHelper.java

@@ -119,6 +119,11 @@ static SnapOverride resolve(@NotNull Block block, boolean submerged)
             return SnapOverride.SELF;
         }
 
+        if (material == Material.DIRT_PATH)
+        {
+            return SnapOverride.SELF;
+        }
+
         if (material == Material.SCAFFOLDING)
         {
             return SnapOverride.SELF;

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

@@ -513,23 +513,37 @@ public boolean hasExplicitPermission(@NotNull Player player, @NotNull ClaimPermi
          return checkPermission(uuid, permission, event, null);
      }
 
-     /**
-      * Check whether a UUID has a certain level of trust with a custom denial message.
-      *
-      * @param uuid the UUID being checked for permissions
-      * @param permission the ClaimPermission level required
-      * @param event the Event triggering the permission check
-      * @param denialOverride a custom denial message supplier, or null to use default
-      * @return the denial message or null if permission is granted
-      */
+    /**
+    * Check whether a UUID has a certain level of trust with a custom denial message.
+    *
+    * @param uuid the UUID being checked for permissions
+    * @param permission the ClaimPermission level required
+    * @param event the Event triggering the permission check
+    * @param denialOverride a custom denial message supplier, or null to use default
+    * @return the denial message or null if permission is granted
+    */
      public @Nullable Supplier<String> checkPermission(
-         @NotNull UUID uuid,
-         @NotNull ClaimPermission permission,
-         @Nullable Event event,
-         @Nullable Supplier<String> denialOverride)
-     {
-         return callPermissionCheck(new ClaimPermissionCheckEvent(uuid, this, permission, event), denialOverride);
-     }
+        @NotNull UUID uuid,
+        @NotNull ClaimPermission permission,
+        @Nullable Event event,
+        @Nullable Supplier<String> denialOverride)
+    {
+        // For wilderness claims, only block if explicitly denied
+        if (this.isWilderness()) {
+            return isPermissionDenied(uuid.toString(), permission) ? 
+                (denialOverride != null ? denialOverride : () -> "You don't have permission to do that in the wilderness.") : 
+                null;
+        }
+        return callPermissionCheck(new ClaimPermissionCheckEvent(uuid, this, permission, event), denialOverride);
+    }
+
+    /**
+     * Checks if this claim represents a wilderness (unclaimed) area.
+     * @return true if this is a wilderness claim, false otherwise
+     */
+     public boolean isWilderness() {
+        return this.id == null;
+    }
 
      /**
       * Helper method for calling a ClaimPermissionCheckEvent.

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

@@ -733,14 +733,17 @@ synchronized void deleteClaimFromSecondaryStorage(Claim claim)
             {
                 root = root.parent;
             }
-
+            
+            // Remove the claim from its parent's children list
+            claim.parent.children.remove(claim);
+            
+            // Save the parent to update the YAML
             this.writeClaimToStorage(root);
-            return;
         }
-
+        
+        // Always try to delete the claim file if it exists
+        // (in case it's a top-level claim or the file wasn't properly cleaned up)
         String claimID = String.valueOf(claim.id);
-
-        //remove from disk
         File claimFile = new File(claimDataFolderPath + File.separator + claimID + ".yml");
         if (claimFile.exists() && !claimFile.delete())
         {

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

@@ -64,8 +64,8 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -76,6 +76,7 @@
 import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
+import java.util.Date;
 import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -580,6 +581,7 @@ else if (world.getEnvironment() == Environment.NORMAL)
         this.config_claims_maxClaimsPerPlayer = config.getInt("GriefPrevention.Claims.MaximumNumberOfClaimsPerPlayer", 0);
         this.config_claims_villagerTradingRequiresTrust = config.getBoolean("GriefPrevention.Claims.VillagerTradingRequiresPermission", true);
         String commandsRequiringAccessTrust = config.getString("GriefPrevention.Claims.CommandsRequiringAccessTrust", "/sethome");
+        this.config_claims_commandsRequiringAccessTrust = new ArrayList<>(Arrays.asList(commandsRequiringAccessTrust.split(";")));
         this.config_claims_supplyPlayerManual = config.getBoolean("GriefPrevention.Claims.DeliverManuals", true);
         this.config_claims_manualDeliveryDelaySeconds = config.getInt("GriefPrevention.Claims.ManualDeliveryDelaySeconds", 30);
         this.config_claims_ravagersBreakBlocks = config.getBoolean("GriefPrevention.Claims.RavagersBreakBlocks", true);

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

@@ -1096,29 +1096,43 @@ void onPlayerPortal(PlayerPortalEvent event)
      }
 
      //when a player teleports
-     @EventHandler(priority = EventPriority.LOWEST)
+     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
      public void onPlayerTeleport(PlayerTeleportEvent event)
      {
-         //FEATURE: prevent players from using ender pearls or chorus fruit to gain access to secured claims
-         if(!instance.config_claims_enderPearlsRequireAccessTrust) return;
- 
-         TeleportCause cause = event.getCause();
-         if(cause != TeleportCause.CHORUS_FRUIT && cause != TeleportCause.ENDER_PEARL) return;
- 
          Player player = event.getPlayer();
          PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
- 
+         
+         // Get the claim at the destination
          Claim toClaim = this.dataStore.getClaimAt(event.getTo(), false, playerData.lastClaim);
-         if(toClaim == null) return;
- 
+         
+         // Get the claim at the original location
+         Claim fromClaim = playerData.lastClaim;
+         
+         // Update the lastClaim to the new location
          playerData.lastClaim = toClaim;
-         Supplier<String> noAccessReason = toClaim.checkPermission(player, ClaimPermission.Access, event);
-         if(noAccessReason == null) return;
- 
-         GriefPrevention.sendMessage(player, TextMode.Err, noAccessReason.get());
-         event.setCancelled(true);
-         if (cause == TeleportCause.ENDER_PEARL)
-             player.getInventory().addItem(new ItemStack(Material.ENDER_PEARL));
+         
+         // If we're moving from one claim to another, or from a claim to wilderness,
+        // we need to update the player's permissions
+        if (fromClaim != toClaim) {
+            player.updateCommands();
+        }
+
+         // Special handling for ender pearls and chorus fruit to prevent gaining access to secured claims
+         if (instance.config_claims_enderPearlsRequireAccessTrust) {
+             TeleportCause cause = event.getCause();
+             if (cause == TeleportCause.CHORUS_FRUIT || cause == TeleportCause.ENDER_PEARL) {
+                 if (toClaim != null) {
+                     Supplier<String> noAccessReason = toClaim.checkPermission(player, ClaimPermission.Access, event);
+                     if (noAccessReason != null) {
+                         GriefPrevention.sendMessage(player, TextMode.Err, noAccessReason.get());
+                         event.setCancelled(true);
+                         if (cause == TeleportCause.ENDER_PEARL) {
+                             player.getInventory().addItem(new ItemStack(Material.ENDER_PEARL));
+                         }
+                     }
+                 }
+             }
+         }
      }
 
      //when a player triggers a raid (in a claim)
@@ -1181,6 +1195,32 @@ public void onPlayerLeashEntity(PlayerLeashEntityEvent event)
          }
      }
 
+     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+     public void onPlayerMove(org.bukkit.event.player.PlayerMoveEvent event) {
+        // Only check if the player has moved a full block
+         if (event.getFrom().getBlockX() == event.getTo().getBlockX() && 
+            event.getFrom().getBlockZ() == event.getTo().getBlockZ() &&
+            event.getFrom().getBlockY() == event.getTo().getBlockY()) {
+            return;
+         }
+
+         Player player = event.getPlayer();
+         PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
+        
+        // Get the claim at the new location
+         Claim toClaim = this.dataStore.getClaimAt(event.getTo(), false, playerData.lastClaim);
+         Claim fromClaim = playerData.lastClaim;
+        
+        // If we're moving between claims or to/from wilderness
+         if (fromClaim != toClaim) {
+             // Update the last claim reference
+             playerData.lastClaim = toClaim;
+            
+             // Update commands to reflect the new location
+             player.updateCommands();
+         }
+     }
+
      //when a player interacts with an entity...
      @EventHandler(ignoreCancelled = true, priority = EventPriority.LOW)
      public void onPlayerInteractEntity(PlayerInteractEntityEvent event)
@@ -1985,10 +2025,12 @@ else if (materialInHand == instance.config_claims_investigationTool && hand == E
                      ClaimInspectionEvent inspectionEvent = new ClaimInspectionEvent(player, clickedBlock, null);
                      Bukkit.getPluginManager().callEvent(inspectionEvent);
                      if (inspectionEvent.isCancelled()) return;
- 
+
                      GriefPrevention.sendMessage(player, TextMode.Info, Messages.BlockNotClaimed);
- 
+
+                     // Clear any existing visualization
                      playerData.setVisibleBoundaries(null);
+                     return;  // Important: Add this return to prevent further processing
                  }
 
                  //claim case