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/EntityEgg.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/EntityEgg.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityEgg.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java index 4b311eb7..167c1e84 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -23,13 +23,11 @@ public class EntityEgg extends EntityProjectile { } protected void a(MovingObjectPosition movingobjectposition) { - // CraftBukkit start - if (movingobjectposition.entity != null) { - if (org.bukkit.craftbukkit.event.CraftEventFactory.handleProjectileEvent((org.bukkit.entity.Projectile) this.getBukkitEntity(), movingobjectposition.entity, DamageSource.projectile(this, this.shooter), 0)) { - ; // Original code does nothing *yet* - } + if (movingobjectposition.entity != null && movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.shooter), 0)) { + ; } + // CraftBukkit start boolean hatching = !this.world.isStatic && this.random.nextInt(8) == 0; int numHatching = (this.random.nextInt(32) == 0) ? 4 : 1; if (!hatching) { |