diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-29 23:17:43 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-11-30 21:46:19 +0000 |
commit | 8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792 (patch) | |
tree | cc229f65097c54cfcd769f686c43efa1dacc8d2f /src/main/java/net/minecraft/server/EntitySmallFireball.java | |
parent | 8665161eaa0160467ce33598c13f1aed4b549a4d (diff) | |
download | craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.gz craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.lz craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.tar.xz craftbukkit-8fbe78a2c3b65f4140c4d0db4bed5a9bcdaf1792.zip |
Updated to use mc-dev rename revision 1
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySmallFireball.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntitySmallFireball.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySmallFireball.java b/src/main/java/net/minecraft/server/EntitySmallFireball.java index 853f32b7..426ad87b 100644 --- a/src/main/java/net/minecraft/server/EntitySmallFireball.java +++ b/src/main/java/net/minecraft/server/EntitySmallFireball.java @@ -30,7 +30,7 @@ public class EntitySmallFireball extends EntityFireball { // CraftBukkit end if (movingobjectposition.entity != null) { // CraftBukkit start - entity damage by entity event + combust event - if (!movingobjectposition.entity.ax()) { // check if not fireproof + if (!movingobjectposition.entity.isFireproof()) { // check if not fireproof boolean stick; org.bukkit.entity.Entity damagee = movingobjectposition.entity.getBukkitEntity(); Projectile projectile = (Projectile) this.getBukkitEntity(); @@ -54,7 +54,7 @@ public class EntitySmallFireball extends EntityFireball { pluginManager.callEvent(combustEvent); if (!combustEvent.isCancelled()) { - movingobjectposition.entity.j(combustEvent.getDuration()); + movingobjectposition.entity.setOnFire(combustEvent.getDuration()); } } // CraftBukkit end |