fix EnderPearlsRequireAccessTrust not working

Author: castledking

pom.xml

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

@@ -1054,7 +1054,7 @@ void onPlayerPortal(PlayerPortalEvent event) {
     }
 
     // when a player teleports
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerTeleport(PlayerTeleportEvent event) {
         Player player = event.getPlayer();
         PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
@@ -1065,32 +1065,34 @@ public void onPlayerTeleport(PlayerTeleportEvent event) {
         // Get the claim at the original location
         Claim fromClaim = playerData.lastClaim;
 
-        // Update the lastClaim to the new location
-        playerData.lastClaim = toClaim;
-
-        // 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
+        // to secured claims. Must run before updating lastClaim so we don't corrupt
+        // player state when cancelling. Use ProtectionHelper for proper 3D claim and
+        // parent inheritance handling.
         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 && instance.config_claims_refundDeniedEnderPearls) {
-                            player.getInventory().addItem(new ItemStack(Material.ENDER_PEARL));
-                        }
+                Supplier<String> noAccessReason = ProtectionHelper.checkPermission(player, event.getTo(),
+                        ClaimPermission.Access, event);
+                if (noAccessReason != null) {
+                    GriefPrevention.sendMessage(player, TextMode.Err, noAccessReason.get());
+                    event.setCancelled(true);
+                    if (cause == TeleportCause.ENDER_PEARL && instance.config_claims_refundDeniedEnderPearls) {
+                        player.getInventory().addItem(new ItemStack(Material.ENDER_PEARL));
                     }
+                    return; // Don't update lastClaim when teleport is cancelled
                 }
             }
         }
+
+        // Update the lastClaim to the new location (only when teleport proceeds)
+        playerData.lastClaim = toClaim;
+
+        // 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();
+        }
     }
 
     // when a player triggers a raid (in a claim)