From 86d7a42c6a245d2f9675abb33bf63d9f076bffe9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 5 Dec 2013 18:41:32 +1100 Subject: [PATCH] Fire EntityDamageByEntityEvent for ItemFrames diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java index 261d0c1..0fdcffe 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -23,6 +23,18 @@ public class EntityItemFrame extends EntityHanging { return false; } else if (this.getItem() != null) { if (!this.world.isStatic) { + // Spigot Start + if ( damagesource.getEntity() != null ) + { + org.bukkit.event.entity.EntityDamageByEntityEvent event = new org.bukkit.event.entity.EntityDamageByEntityEvent( + damagesource.getEntity().getBukkitEntity(), getBukkitEntity(), org.bukkit.event.entity.EntityDamageEvent.DamageCause.ENTITY_ATTACK, f ); + getBukkitEntity().getServer().getPluginManager().callEvent( event ); + if ( event.isCancelled() ) + { + return false; + } + } + // Spigot End this.b(damagesource.getEntity(), false); this.setItem((ItemStack) null); } -- 1.8.3.2