diff --git a/src/com/garbagemule/MobArena/ArenaListener.java b/src/com/garbagemule/MobArena/ArenaListener.java index 952adc1..4f8d58e 100644 --- a/src/com/garbagemule/MobArena/ArenaListener.java +++ b/src/com/garbagemule/MobArena/ArenaListener.java @@ -848,8 +848,7 @@ public class ArenaListener public void onPlayerInteract(PlayerInteractEvent event) { Player p = event.getPlayer(); - if (arena.inArena(p) || !arena.inLobby(p)) - return; + if (!arena.inLobby(p)) return; // Player is in the lobby, so disallow using items. Action a = event.getAction(); @@ -868,9 +867,6 @@ public class ArenaListener } // Sign else if (event.getClickedBlock().getState() instanceof Sign) { - // Make sure to allow clicking signs - event.setCancelled(false); - Sign sign = (Sign) event.getClickedBlock().getState(); handleSign(sign, p); } diff --git a/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java b/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java index 7cc168f..ff05b24 100644 --- a/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java +++ b/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java @@ -228,7 +228,8 @@ public class MAGlobalListener implements Listener arena.getEventListener().onPlayerDropItem(event); } - @EventHandler(priority = EventPriority.NORMAL) + // HIGHEST => after SignShop + @EventHandler(priority = EventPriority.HIGHEST) public void playerInteract(PlayerInteractEvent event) { if (!am.isEnabled()) return; for (Arena arena : am.getArenas())