summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft
diff options
context:
space:
mode:
authort00thpick1 <t00thpick1dirko@gmail.com>2014-06-24 12:17:18 -0400
committerTravis Watkins <amaranth@ubuntu.com>2014-06-24 18:24:29 -0500
commit83e934b3bd70e428baecec8096969d7717f26bc4 (patch)
tree01ed60da1b034297c59308d81d6e8a6515b7665f /src/main/java/net/minecraft
parent9099e48e74dc2c7d97b67c1a7e72afc64f5ac0dd (diff)
downloadcraftbukkit-83e934b3bd70e428baecec8096969d7717f26bc4.tar
craftbukkit-83e934b3bd70e428baecec8096969d7717f26bc4.tar.gz
craftbukkit-83e934b3bd70e428baecec8096969d7717f26bc4.tar.lz
craftbukkit-83e934b3bd70e428baecec8096969d7717f26bc4.tar.xz
craftbukkit-83e934b3bd70e428baecec8096969d7717f26bc4.zip
[Bleeding] Fix checks for non-living entities. Fixes BUKKIT-5667
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r--src/main/java/net/minecraft/server/EntityFireball.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityItemFrame.java2
2 files changed, 2 insertions, 2 deletions
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