Merge pull request #327 from slipcor/offhand-2

Ignore off-hand interact events in Setup Mode (since Minecraft/Spigot 1.9). Fixes #299
This commit is contained in:
garbagemule
2016-12-17 01:44:43 +01:00
committed by GitHub
@@ -24,6 +24,7 @@ import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@@ -254,6 +255,8 @@ public class SetupCommand implements Command, Listener {
Player p = event.getPlayer();
if (!p.equals(player)) return;
if (event.getHand().equals(EquipmentSlot.OFF_HAND)) return;
ItemStack tool = p.getItemInHand();
if (!isTool(tool)) return;