Paper/nms-patches/EntityItemFrame.patch

15 lines
724 B
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityItemFrame.java
+++ b/net/minecraft/server/EntityItemFrame.java
2016-02-29 22:32:46 +01:00
@@ -31,6 +31,11 @@
return false;
} else if (!damagesource.isExplosion() && this.getItem() != null) {
2015-02-26 23:41:06 +01:00
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
2016-02-29 22:32:46 +01:00
this.b(damagesource.getEntity(), false);
2016-03-30 21:50:59 +02:00
this.a(SoundEffects.cS, 1.0F, 1.0F);
this.setItem((ItemStack) null);