From d31990d2571b64e47bbd2e7b868bd41fadd25fa6 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Wed, 22 Oct 2014 19:23:07 -0700 Subject: [PATCH] Bug Fixes: Mod Access Trust and Subdivision Stick Mod Access Trust config setting now also protects from left clicks. Right-clicking in a subdivision with a stick does not produce an error. --- .../ryanhamshire/GriefPrevention/PlayerEventHandler.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index ef5efae..feb950b 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -1059,7 +1059,7 @@ class PlayerEventHandler implements Listener //don't care about left-clicking on most blocks, this is probably a break action if(action == Action.LEFT_CLICK_BLOCK) { - if(!this.onLeftClickWatchList(clickedBlockType)) return; + if(!this.onLeftClickWatchList(clickedBlockType) && !GriefPrevention.instance.config_mods_accessTrustIds.Contains(new MaterialInfo(clickedBlock.getTypeId(), clickedBlock.getData(), null))) return; } //FEATURE: shovel and stick can be used from a distance away @@ -1301,7 +1301,11 @@ class PlayerEventHandler implements Listener //if deleteclaims permission, tell about the player's offline time if(!claim.isAdminClaim() && player.hasPermission("griefprevention.deleteclaims")) { - PlayerData otherPlayerData = this.dataStore.getPlayerData(claim.ownerID); + if(claim.parent != null) + { + claim = claim.parent; + } + PlayerData otherPlayerData = this.dataStore.getPlayerData(claim.ownerID); Date lastLogin = otherPlayerData.lastLogin; Date now = new Date(); long daysElapsed = (now.getTime() - lastLogin.getTime()) / (1000 * 60 * 60 * 24);