Upstream/ImageOnMap
1
0
Fork 0
mirror of https://github.com/zDevelopers/ImageOnMap.git synced 2024-11-25 19:45:52 +01:00
Code Issues Projects Releases Wiki Activity

* BUG: Fix item frame events priority and cancellation handling.

Browse Source
This commit is contained in:
Adrien Prokopowicz 2016-07-06 00:03:02 +02:00
parent 3ea55f5fb2
commit a90418d3a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/moribus/imageonmap/ui/MapItemManager.java
View File

@ -240,7 +240,7 @@ public class MapItemManager implements Listener
} }
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGHEST)
static public void onEntityDamage(EntityDamageByEntityEvent event) static public void onEntityDamage(EntityDamageByEntityEvent event)
{ {
if(event.isCancelled()) return; if(event.isCancelled()) return;
@ -250,9 +250,10 @@ public class MapItemManager implements Listener
onItemFrameRemove((ItemFrame)event.getEntity(), (Player)event.getDamager(), event); onItemFrameRemove((ItemFrame)event.getEntity(), (Player)event.getDamager(), event);
} }
@EventHandler @EventHandler(priority = EventPriority.HIGHEST)
static public void onEntityInteract(PlayerInteractEntityEvent event) static public void onEntityInteract(PlayerInteractEntityEvent event)
{ {
if(event.isCancelled()) return;
if(!(event.getRightClicked() instanceof ItemFrame)) return; if(!(event.getRightClicked() instanceof ItemFrame)) return;
onItemFramePlace((ItemFrame)event.getRightClicked(), event.getPlayer(), event); onItemFramePlace((ItemFrame)event.getRightClicked(), event.getPlayer(), event);