diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptEventListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptEventListener.java index 442af91a..e17e0b99 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptEventListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptEventListener.java @@ -39,7 +39,9 @@ import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.event.player.*; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; @Linked(LinkageType.LISTENER) public class ScriptEventListener implements Listener { @@ -84,8 +86,13 @@ public class ScriptEventListener implements Listener { customScriptManager.callEvent(EventType.BreakBlock, event.getPlayer(), event); } + private Set ignore = new HashSet<>(); + @EventHandler public void onPlayerInteract(PlayerInteractEvent event) { + if (ignore.remove(event.getPlayer())) { + return; + } if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) { customScriptManager.callEvent(EventType.RightClick, event.getPlayer(), event); } @@ -124,6 +131,7 @@ public class ScriptEventListener implements Listener { @EventHandler public void onPlayerDropItem(PlayerDropItemEvent event) { + ignore.add(event.getPlayer()); customScriptManager.callEvent(EventType.DropItem, event.getPlayer(), event); } }