diff options
Diffstat (limited to 'src/main/java/net')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index c509e600..aa7e96fd 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -370,6 +370,8 @@ public abstract class EntityHuman extends EntityLiving { if (event.isCancelled()) { return false; } + + i = event.getDamage(); } // CraftBukkit end 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 } |