diff options
Diffstat (limited to 'nms-patches/EntityItemFrame.patch')
| -rw-r--r-- | nms-patches/EntityItemFrame.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/EntityItemFrame.patch b/nms-patches/EntityItemFrame.patch index c98af2f2..4178fdcf 100644 --- a/nms-patches/EntityItemFrame.patch +++ b/nms-patches/EntityItemFrame.patch @@ -1,8 +1,8 @@ --- a/net/minecraft/server/EntityItemFrame.java +++ b/net/minecraft/server/EntityItemFrame.java -@@ -32,6 +32,11 @@ +@@ -31,6 +31,11 @@ return false; - } else if (!damagesource.isExplosion() && this.getItem() != null) { + } else if (!damagesource.isExplosion() && !this.getItem().isEmpty()) { if (!this.world.isClientSide) { + // CraftBukkit start - fire EntityDamageEvent + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f, false) || this.dead) { @@ -10,5 +10,5 @@ + } + // CraftBukkit end this.b(damagesource.getEntity(), false); - this.a(SoundEffects.cX, 1.0F, 1.0F); - this.setItem((ItemStack) null); + this.a(SoundEffects.dh, 1.0F, 1.0F); + this.setItem(ItemStack.a); |