diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityItemFrame.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityItemFrame.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java index 8d39f5f4..940e7c86 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -24,8 +24,7 @@ public class EntityItemFrame extends EntityHanging { } else if (this.getItem() != null) { if (!this.world.isStatic) { // CraftBukkit start - fire EntityDamageEvent - org.bukkit.event.entity.EntityDamageEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.handleEntityDamageEvent(this, damagesource, f); - if ((event != null && event.isCancelled()) || this.dead) { + if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f) || this.dead) { return true; } // CraftBukkit end |