Upstream/ImageOnMap
1
0
Fork 0
mirror of https://github.com/zDevelopers/ImageOnMap.git synced 2024-09-28 22:47:45 +02:00
Code Issues Projects Releases Wiki Activity

Don't remove map if not allowed to damage item frames there

Browse Source 
If the EntityDamageByEntityEvent is cancelled (for example by a plugin like WorldGuard) the maps should not be removed. This is on high priority, to allow other plugins to cancel the event first.
This commit is contained in:
Brokkonaut 2016-05-25 23:50:33 +02:00
parent bc34f8cda5
commit bd2c5d7a9a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ import org.bukkit.Material;
import org.bukkit.entity.ItemFrame;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
@ -239,9 +240,10 @@ public class MapItemManager implements Listener
}
@EventHandler
@EventHandler(priority = EventPriority.HIGH)
static public void onEntityDamage(EntityDamageByEntityEvent event)
{
if(event.isCancelled()) return;
if(!(event.getEntity() instanceof ItemFrame)) return;
if(!(event.getDamager() instanceof Player)) return;