From 62624a079932adbe3e75a3bc2a120d6377a9a0e3 Mon Sep 17 00:00:00 2001 From: sk89q Date: Thu, 20 Jan 2011 00:49:35 -0800 Subject: Added suffocation damage as an event. --- src/main/java/net/minecraft/server/EntityLiving.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 24daad60..fb0debdd 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -141,7 +141,17 @@ public abstract class EntityLiving extends Entity { } } if (B() && C()) { - a(((Entity) (null)), 1); + // CraftBukkit start + CraftServer server = ((WorldServer) l).getServer(); + org.bukkit.entity.Entity victim = this.getBukkitEntity(); + DamageCause damageType = EntityDamageEvent.DamageCause.SUFFOCATION; + EntityDamageEvent evt = new EntityDamageEvent(victim, damageType, 1); + server.getPluginManager().callEvent(evt); + + if (!evt.isCancelled()){ + a(((Entity) (null)), 1); + } + // CraftBukkit end } if (ae || this.l.z) { Z = 0; -- cgit v1.2.3