diff options
| author | Gunther De Wachter <GuntherDW@gmail.com> | 2011-03-17 18:24:36 +0100 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2011-03-17 20:01:07 +0100 |
| commit | d732457354f667e11feee0e64b00593739a2f69e (patch) | |
| tree | f0834acedb0108e6c67254d42403f800b9c771c5 /src/main/java/net/minecraft/server/EntityLiving.java | |
| parent | 28c9439f94a02c8780a43df2837d848bb1db24e8 (diff) | |
| download | craftbukkit-d732457354f667e11feee0e64b00593739a2f69e.tar craftbukkit-d732457354f667e11feee0e64b00593739a2f69e.tar.gz craftbukkit-d732457354f667e11feee0e64b00593739a2f69e.tar.lz craftbukkit-d732457354f667e11feee0e64b00593739a2f69e.tar.xz craftbukkit-d732457354f667e11feee0e64b00593739a2f69e.zip | |
Implement DamageType.VOID
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityLiving.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index b79d6b91..94882460 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -10,6 +10,7 @@ import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.TrigMath; import org.bukkit.event.Event.Type; +import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDeathEvent; @@ -796,7 +797,21 @@ public abstract class EntityLiving extends Entity { } protected void M() { - this.a((Entity) null, 4); + // CraftBukkit start + CraftServer server = ((WorldServer) this.world).getServer(); + DamageCause damageType = EntityDamageEvent.DamageCause.VOID; + org.bukkit.block.Block damager = null; + org.bukkit.entity.Entity damagee = this.getBukkitEntity(); + int damageDone = 4; + EntityDamageByBlockEvent event = new EntityDamageByBlockEvent(damager, damagee, damageType, damageDone); + server.getPluginManager().callEvent(event); + + if (event.isCancelled()) { + return; + } + damageDone = event.getDamage(); + this.a((Entity) null, damageDone); + // CraftBukkit end } public Vec3D N() { |