skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #327 from slipcor/offhand-2

Browse Source 
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
parent 65f33ae1a4 e6e4782de8
commit 60a173d447
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/garbagemule/MobArena/commands/setup/SetupCommand.java
+3
View File
@@ -24,6 +24,7 @@ import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
@@ -254,6 +255,8 @@ public class SetupCommand implements Command, Listener {
Player p = event.getPlayer(); Player p = event.getPlayer();
if (!p.equals(player)) return; if (!p.equals(player)) return;
if (event.getHand().equals(EquipmentSlot.OFF_HAND)) return;
ItemStack tool = p.getItemInHand(); ItemStack tool = p.getItemInHand();
if (!isTool(tool)) return; if (!isTool(tool)) return;