PaperMC/nms-patches/EntityItemFrame.patch

16 lines
809 B
Diff
Raw Normal View History

--- ../work/decompile-8eb82bde//net/minecraft/server/EntityItemFrame.java 2014-11-28 17:43:43.113707435 +0000
+++ src/main/java/net/minecraft/server/EntityItemFrame.java 2014-11-28 17:38:20.000000000 +0000
@@ -27,6 +27,12 @@
return false;
} else if (!damagesource.isExplosion() && this.getItem() != null) {
if (!this.world.isStatic) {
+ // CraftBukkit start - fire EntityDamageEvent
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f, false) || this.dead) {
+ return true;
+ }
+ // CraftBukkit end
+
this.a(damagesource.getEntity(), false);
this.setItem((ItemStack) null);
}