Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call EntityDamageEvent on ItemFrame item removal. Fixes BUKKIT-5020

Browse Source 
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
This commit is contained in:
Starbuck Johnson 2013-12-05 10:33:22 -06:00 committed by feildmaster
parent 3cf569a33f
commit 36ef37b982
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minecraft/server/EntityItemFrame.java
View File

@ -23,6 +23,11 @@ public class EntityItemFrame extends EntityHanging {
return false; return false;
} else if (this.getItem() != null) { } else if (this.getItem() != null) {
if (!this.world.isStatic) { 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.b(damagesource.getEntity(), false);
this.setItem((ItemStack) null); this.setItem((ItemStack) null);
} }