diff options
| author | Feildmaster <admin@feildmaster.com> | 2012-02-08 13:26:45 -0600 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-02-09 20:12:38 -0500 |
| commit | 8ecfca47def026cde9a80cf8a68af2476d0b65aa (patch) | |
| tree | f6a0c73a4b771d893d564b65669072dfcd0a599f /src/main/java | |
| parent | 6dda89d8736316af459171e9fcc3e75b204569b0 (diff) | |
| download | craftbukkit-8ecfca47def026cde9a80cf8a68af2476d0b65aa.tar craftbukkit-8ecfca47def026cde9a80cf8a68af2476d0b65aa.tar.gz craftbukkit-8ecfca47def026cde9a80cf8a68af2476d0b65aa.tar.lz craftbukkit-8ecfca47def026cde9a80cf8a68af2476d0b65aa.tar.xz craftbukkit-8ecfca47def026cde9a80cf8a68af2476d0b65aa.zip | |
[Bleeding] Fixed EnderDragon suffocation.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 6cf48cb6..ec2080d2 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -177,7 +177,7 @@ public abstract class EntityLiving extends Entity { } // CraftBukkit start - don't inline the damage, perform it with an event - if (this.isAlive() && this.inBlock()) { + if (this.isAlive() && this.inBlock() && !(this instanceof EntityEnderDragon)) { // EnderDragon's don't suffocate. EntityDamageEvent event = new EntityDamageEvent(this.getBukkitEntity(), EntityDamageEvent.DamageCause.SUFFOCATION, 1); this.world.getServer().getPluginManager().callEvent(event); |