diff options
author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-02-28 17:43:56 +1100 |
---|---|---|
committer | Andrew Ardill <andrew.ardill@gmail.com> | 2011-02-28 17:43:56 +1100 |
commit | 76d8016b32fb747e82750597cf3efc69deed169c (patch) | |
tree | a576ed334006ccefad1d2375f67d873caff2e761 /src/main/java/net/minecraft/server/EntityLiving.java | |
parent | 41fea9b40e7a6aefddebb4e5d0db1321ee28852f (diff) | |
download | craftbukkit-76d8016b32fb747e82750597cf3efc69deed169c.tar craftbukkit-76d8016b32fb747e82750597cf3efc69deed169c.tar.gz craftbukkit-76d8016b32fb747e82750597cf3efc69deed169c.tar.lz craftbukkit-76d8016b32fb747e82750597cf3efc69deed169c.tar.xz craftbukkit-76d8016b32fb747e82750597cf3efc69deed169c.zip |
BUGFIX: Damage events should be using getDamage() to set damage.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityLiving.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index e021be0d..b79d6b91 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -124,12 +124,13 @@ public abstract class EntityLiving extends Entity { CraftServer server = ((WorldServer) this.world).getServer(); org.bukkit.entity.Entity victim = this.getBukkitEntity(); DamageCause damageType = EntityDamageEvent.DamageCause.SUFFOCATION; + int damage = 1; - EntityDamageEvent event = new EntityDamageEvent(victim, damageType, 1); + EntityDamageEvent event = new EntityDamageEvent(victim, damageType, damage); server.getPluginManager().callEvent(event); if (!event.isCancelled()) { - this.a((Entity) null, 1); + this.a((Entity) null, event.getDamage()); } // CraftBukkit end } |