mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-18 08:36:13 +01:00
63 lines
2.6 KiB
Diff
63 lines
2.6 KiB
Diff
--- 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 EntityProjectileThrowable {
|
|
|
|
public EntityEgg(EntityTypes<? extends EntityEgg> entitytypes, World world) {
|
|
@@ -21,20 +28,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 = (EntityChicken) EntityTypes.CHICKEN.a(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);
|