From b83fc4a80c4ed93c1844e8acd0581f45789d6d36 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Tue, 15 Mar 2016 16:19:22 -0700 Subject: [PATCH] Fixed right-click annoyance with golden shovel. Root cause - dual wielding is a thing now, since 1.9 release. GP will ignore your off hand item in all cases. --- src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index b534c5d..ef07104 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -64,6 +64,7 @@ import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.*; import org.bukkit.event.player.PlayerLoginEvent.Result; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.MetadataValue; @@ -1570,6 +1571,9 @@ class PlayerEventHandler implements Listener if(action == Action.LEFT_CLICK_AIR) return; if(action == Action.PHYSICAL) return; + //not interested in offhand clicks + if(event.getHand() == EquipmentSlot.OFF_HAND) return; + Player player = event.getPlayer(); Block clickedBlock = event.getClickedBlock(); //null returned here means interacting with air