BUGFIX: Damage events should be using getDamage() to set damage.

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
         }