diff options
| author | feildmaster <admin@feildmaster.com> | 2012-03-12 17:55:02 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-03-15 05:11:48 -0400 |
| commit | 45031672838e5686bb3dbb8909f2fdc5b40d6106 (patch) | |
| tree | b055bc07ec76c08f9866fe6a14cb72955d921cf1 /src/main/java/net/minecraft/server/EntityEnderCrystal.java | |
| parent | c625d00351f3c9c7042c8e391d76e333d57bd04a (diff) | |
| download | craftbukkit-45031672838e5686bb3dbb8909f2fdc5b40d6106.tar craftbukkit-45031672838e5686bb3dbb8909f2fdc5b40d6106.tar.gz craftbukkit-45031672838e5686bb3dbb8909f2fdc5b40d6106.tar.lz craftbukkit-45031672838e5686bb3dbb8909f2fdc5b40d6106.tar.xz craftbukkit-45031672838e5686bb3dbb8909f2fdc5b40d6106.zip | |
Fixed EntityDamageByEntityEvent to call for every attackable entity. Fixes BUKKIT-1129, Fixes BUKKIT-1054 and Fixes BUKKIT-147.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityEnderCrystal.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityEnderCrystal.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java index 5079d229..cd48def2 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -50,6 +50,11 @@ public class EntityEnderCrystal extends Entity { this.b = 0; if (this.b <= 0) { if (!this.world.isStatic) { + // CraftBukkit start - All non-living entities need this + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, i)) { + return false; + } + // CraftBukkit end this.die(); this.world.explode(this, this.locX, this.locY, this.locZ, 6.0F); // CraftBukkit - (Entity) null -> this. } else { |