2014-11-28 12:23:19 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityItemFrame.java 2014-11-28 11:22:55.926823163 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/EntityItemFrame.java 2014-11-28 11:01:54.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -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);
|
|
|
|
|
}
|
