Paper/nms-patches/EntityEgg.patch
2015-03-04 09:48:58 +00:00

66 lines
2.6 KiB
Diff

--- /home/matt/mc-dev-private//net/minecraft/server/EntityEgg.java 2015-02-26 22:40:22.507608140 +0000
+++ src/main/java/net/minecraft/server/EntityEgg.java 2015-02-26 22:40:22.507608140 +0000
@@ -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) {
@@ -19,21 +26,36 @@
movingobjectposition.entity.damageEntity(DamageSource.projectile(this, this.getShooter()), 0.0F);
}
- if (!this.world.isClientSide && this.random.nextInt(8) == 0) {
- byte b0 = 1;
+ // CraftBukkit start - Fire PlayerEggThrowEvent
+ boolean hatching = !this.world.isClientSide && this.random.nextInt(8) == 0;
+ int numHatching = (this.random.nextInt(32) == 0) ? 4 : 1;
+ if (!hatching) {
+ numHatching = 0;
+ }
+
+ EntityType hatchingType = EntityType.CHICKEN;
+
+ Entity shooter = this.getShooter();
+ if (shooter instanceof EntityPlayer) {
+ Player player = (shooter == null) ? null : (Player) shooter.getBukkitEntity();
+
+ PlayerEggThrowEvent event = new PlayerEggThrowEvent(player, (org.bukkit.entity.Egg) this.getBukkitEntity(), hatching, (byte) numHatching, hatchingType);
+ this.world.getServer().getPluginManager().callEvent(event);
+
+ hatching = event.isHatching();
+ numHatching = event.getNumHatches();
+ hatchingType = event.getHatchingType();
+ }
- if (this.random.nextInt(32) == 0) {
- b0 = 4;
- }
-
- for (int i = 0; i < b0; ++i) {
- EntityChicken entitychicken = new EntityChicken(this.world);
-
- entitychicken.setAgeRaw(-24000);
- entitychicken.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
- this.world.addEntity(entitychicken);
- }
+ if (hatching) {
+ for (int k = 0; k < numHatching; k++) {
+ org.bukkit.entity.Entity entity = world.getWorld().spawn(new org.bukkit.Location(world.getWorld(), this.locX, this.locY, this.locZ, this.yaw, 0.0F), hatchingType.getEntityClass(), org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG);
+ if (entity instanceof Ageable) {
+ ((Ageable) entity).setBaby();
+ }
+ }
}
+ // CraftBukkit end
double d0 = 0.08D;