From 011a59eb47d35a76efe99ad7e2074f9ecb784900 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Mon, 6 Jun 2016 20:59:59 +0200 Subject: [PATCH] MassiveCore - Skip Off Hand Interact Test 1 --- src/com/massivecraft/factions/engine/EngineMain.java | 3 +++ .../massivecraft/factions/integration/spigot/EngineSpigot.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/com/massivecraft/factions/engine/EngineMain.java b/src/com/massivecraft/factions/engine/EngineMain.java index d7aa9c52..063e9958 100644 --- a/src/com/massivecraft/factions/engine/EngineMain.java +++ b/src/com/massivecraft/factions/engine/EngineMain.java @@ -1669,6 +1669,9 @@ public class EngineMain extends Engine @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onPlayerInteractEntity(PlayerInteractEntityEvent event) { + // Ignore Off Hand + if (isOffHand(event)) return; + // Gather Info final Player player = event.getPlayer(); final Entity entity = event.getRightClicked(); diff --git a/src/com/massivecraft/factions/integration/spigot/EngineSpigot.java b/src/com/massivecraft/factions/integration/spigot/EngineSpigot.java index 5371fba4..f2ad63a5 100644 --- a/src/com/massivecraft/factions/integration/spigot/EngineSpigot.java +++ b/src/com/massivecraft/factions/integration/spigot/EngineSpigot.java @@ -41,6 +41,9 @@ public class EngineSpigot extends Engine @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent event) { + // Ignore Off Hand + if (isOffHand(event)) return; + // Gather Info final Player player = event.getPlayer(); if (MUtil.isntPlayer(player)) return;