Paper/nms-patches/EntityItemFrame.patch

15 lines
724 B
Diff
Raw Normal View History

2015-05-25 18:37:24 +08:00
--- a/net/minecraft/server/EntityItemFrame.java
+++ b/net/minecraft/server/EntityItemFrame.java
2016-05-10 19:47:39 +08:00
@@ -32,6 +32,11 @@
return false;
} else if (!damagesource.isExplosion() && this.getItem() != null) {
2015-02-27 06:41:06 +08: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-03-01 05:32:46 +08:00
this.b(damagesource.getEntity(), false);
2016-06-09 09:43:49 +08:00
this.a(SoundEffects.cX, 1.0F, 1.0F);
this.setItem((ItemStack) null);