From 36ef37b9823b7d2c8f90a14c3cb938ccd93c30a2 Mon Sep 17 00:00:00 2001 From: Starbuck Johnson Date: Thu, 5 Dec 2013 10:33:22 -0600 Subject: [PATCH] Call EntityDamageEvent on ItemFrame item removal. Fixes BUKKIT-5020 Calling this event allows plugins to react to the situation by simply handling a normal damage event, possibly using existing code to handle other entity damage. Pulled from PR #1279 --- src/main/java/net/minecraft/server/EntityItemFrame.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java index 261d0c1ec..059a1e8a6 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -23,6 +23,11 @@ public class EntityItemFrame extends EntityHanging { return false; } else if (this.getItem() != null) { if (!this.world.isStatic) { + // CraftBukkit start + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleEntityDamageEvent(this, damagesource, f).isCancelled() || this.dead) { + return false; + } + // CraftBukkit end this.b(damagesource.getEntity(), false); this.setItem((ItemStack) null); }