Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-23 11:06:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix lobby potion stuff.

Browse Source
This commit is contained in:
garbagemule 2013-08-22 15:00:50 +02:00
parent f1afdd282a
commit 402e6d4de9
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/garbagemule/MobArena/ArenaListener.java
View File

@ -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);
}

3
src/com/garbagemule/MobArena/listeners/MAGlobalListener.java
View File

@ -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())