blob: 05b65d95044c16402cb762d95d648c6f669cbe2c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
--- /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 @@
return false;
} else if (!damagesource.isExplosion() && this.getItem() != null) {
if (!this.world.isClientSide) {
+ // 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);
}
|
