summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityItemFrame.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/EntityItemFrame.patch')
-rw-r--r--nms-patches/EntityItemFrame.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/nms-patches/EntityItemFrame.patch b/nms-patches/EntityItemFrame.patch
new file mode 100644
index 00000000..1ae52fd2
--- /dev/null
+++ b/nms-patches/EntityItemFrame.patch
@@ -0,0 +1,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);
+ }