2015-02-26 23:41:06 +01:00
|
|
|
--- /home/matt/mc-dev-private//net/minecraft/server/EntityItemFrame.java 2015-02-26 22:40:22.583608139 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/EntityItemFrame.java 2015-02-26 22:40:22.587608139 +0000
|
|
|
|
|
@@ -27,6 +27,11 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
return false;
|
|
|
|
|
} else if (!damagesource.isExplosion() && this.getItem() != null) {
|
2015-02-26 23:41:06 +01:00
|
|
|
if (!this.world.isClientSide) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // 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);
|
|
|
|
|
}
|
