--- a/net/minecraft/server/EntityEgg.java +++ b/net/minecraft/server/EntityEgg.java @@ -1,5 +1,12 @@ package net.minecraft.server; +// CraftBukkit start +import org.bukkit.entity.Ageable; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerEggThrowEvent; +// CraftBukkit end + public class EntityEgg extends EntityProjectile { public EntityEgg(World world) { @@ -20,20 +27,40 @@ } if (!this.world.isClientSide) { - if (this.random.nextInt(8) == 0) { + boolean hatching = this.random.nextInt(8) == 0; // CraftBukkit + if (true) { byte b0 = 1; if (this.random.nextInt(32) == 0) { b0 = 4; } - for (int i = 0; i < b0; ++i) { - EntityChicken entitychicken = new EntityChicken(this.world); + // CraftBukkit start + if (!hatching) { + b0 = 0; + } + EntityType hatchingType = EntityType.CHICKEN; + + Entity shooter = this.getShooter(); + if (shooter instanceof EntityPlayer) { + PlayerEggThrowEvent event = new PlayerEggThrowEvent((Player) shooter.getBukkitEntity(), (org.bukkit.entity.Egg) this.getBukkitEntity(), hatching, b0, hatchingType); + this.world.getServer().getPluginManager().callEvent(event); + + b0 = event.getNumHatches(); + hatching = event.isHatching(); + hatchingType = event.getHatchingType(); + } - entitychicken.setAgeRaw(-24000); - entitychicken.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); - this.world.addEntity(entitychicken); + if (hatching) { + for (int i = 0; i < b0; ++i) { + Entity entity = world.getWorld().createEntity(new org.bukkit.Location(world.getWorld(), this.locX, this.locY, this.locZ, this.yaw, 0.0F), hatchingType.getEntityClass()); + if (entity.getBukkitEntity() instanceof Ageable) { + ((Ageable) entity.getBukkitEntity()).setBaby(); + } + world.getWorld().addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG); + } } + // CraftBukkit end } this.world.broadcastEntityEffect(this, (byte) 3);