nms-patches/EntityItemFrame.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

--- ../work/decompile-bb26c12b/net/minecraft/server/EntityItemFrame.java	2014-11-27 08:59:46.693421882 +1100
+++ src/main/java/net/minecraft/server/EntityItemFrame.java	2014-11-27 08:42:10.176850864 +1100
@@ -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);
             }