From 83e934b3bd70e428baecec8096969d7717f26bc4 Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Tue, 24 Jun 2014 12:17:18 -0400 Subject: [Bleeding] Fix checks for non-living entities. Fixes BUKKIT-5667 --- src/main/java/net/minecraft/server/EntityFireball.java | 2 +- src/main/java/net/minecraft/server/EntityItemFrame.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java index 937882b3..9cbcfc9b 100644 --- a/src/main/java/net/minecraft/server/EntityFireball.java +++ b/src/main/java/net/minecraft/server/EntityFireball.java @@ -235,7 +235,7 @@ public abstract class EntityFireball extends Entity { this.P(); if (damagesource.getEntity() != null) { // CraftBukkit start - if (!CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) { + if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) { return false; } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java index 940e7c86..6951c1d9 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -24,7 +24,7 @@ public class EntityItemFrame extends EntityHanging { } else if (this.getItem() != null) { if (!this.world.isStatic) { // CraftBukkit start - fire EntityDamageEvent - if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f) || this.dead) { + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f) || this.dead) { return true; } // CraftBukkit end -- cgit v1.2.3