diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 17:36:27 +0100 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 17:39:17 +0100 |
| commit | 2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb (patch) | |
| tree | 412002b4ee8104908e0d71a996500ae188860ad4 /src/main/java/net/minecraft/server/Entity.java | |
| parent | 3c5632de31b923c8eaefae130f042a4d24566881 (diff) | |
| download | craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar.gz craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar.lz craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar.xz craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.zip | |
Rename revision 2
Diffstat (limited to 'src/main/java/net/minecraft/server/Entity.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 3939f993..0333078c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -268,10 +268,10 @@ public abstract class Entity { this.world.getServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { - this.damageEntity(DamageSource.b, event.getDamage()); + this.damageEntity(DamageSource.BURN, event.getDamage()); } } else { - this.damageEntity(DamageSource.b, 1); + this.damageEntity(DamageSource.BURN, 1); } // CraftBukkit end } @@ -310,7 +310,7 @@ public abstract class Entity { server.getPluginManager().callEvent(event); if (!event.isCancelled()) { - this.damageEntity(DamageSource.c, event.getDamage()); + this.damageEntity(DamageSource.LAVA, event.getDamage()); } if (this.fireTicks <= 0) { @@ -329,7 +329,7 @@ public abstract class Entity { } // CraftBukkit end - this.damageEntity(DamageSource.c, 4); + this.damageEntity(DamageSource.LAVA, 4); this.fireTicks = 600; } } @@ -668,7 +668,7 @@ public abstract class Entity { i = event.getDamage(); } // CraftBukkit end - this.damageEntity(DamageSource.a, i); + this.damageEntity(DamageSource.FIRE, i); } } |