craftbukkit/nms-patches/net/minecraft/world/entity/projectile/EntityEgg.patch

80 lines
3.5 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/projectile/EntityEgg.java
+++ b/net/minecraft/world/entity/projectile/EntityEgg.java
@@ -11,6 +11,16 @@
2021-03-16 09:00:00 +11:00
import net.minecraft.world.phys.MovingObjectPosition;
import net.minecraft.world.phys.MovingObjectPositionEntity;
+// CraftBukkit start
2021-03-16 09:00:00 +11:00
+import net.minecraft.server.level.EntityPlayer;
+import net.minecraft.world.entity.Entity;
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.EntityRemoveEvent;
+import org.bukkit.event.player.PlayerEggThrowEvent;
+// CraftBukkit end
+
2019-04-23 12:00:00 +10:00
public class EntityEgg extends EntityProjectileThrowable {
2019-04-23 12:00:00 +10:00
public EntityEgg(EntityTypes<? extends EntityEgg> entitytypes, World world) {
@@ -47,26 +57,53 @@
2021-11-22 09:00:00 +11:00
protected void onHit(MovingObjectPosition movingobjectposition) {
super.onHit(movingobjectposition);
2023-06-08 01:30:00 +10:00
if (!this.level().isClientSide) {
2016-11-17 12:41:03 +11:00
- if (this.random.nextInt(8) == 0) {
2023-06-24 17:15:05 +10:00
+ // CraftBukkit start
+ boolean hatching = this.random.nextInt(8) == 0;
2016-11-17 12:41:03 +11:00
+ if (true) {
2023-06-24 17:15:05 +10:00
+ // CraftBukkit end
2016-11-17 12:41:03 +11:00
byte b0 = 1;
if (this.random.nextInt(32) == 0) {
b0 = 4;
}
+ // CraftBukkit start
+ EntityType hatchingType = EntityType.CHICKEN;
2015-02-26 22:41:06 +00:00
+
2021-11-22 09:00:00 +11:00
+ Entity shooter = this.getOwner();
2023-06-24 17:15:05 +10:00
+ if (!hatching) {
+ b0 = 0;
+ }
2016-11-17 12:41:03 +11:00
+ if (shooter instanceof EntityPlayer) {
+ PlayerEggThrowEvent event = new PlayerEggThrowEvent((Player) shooter.getBukkitEntity(), (org.bukkit.entity.Egg) this.getBukkitEntity(), hatching, b0, hatchingType);
2023-06-08 01:30:00 +10:00
+ this.level().getCraftServer().getPluginManager().callEvent(event);
2015-02-26 22:41:06 +00:00
+
2016-11-17 12:41:03 +11:00
+ b0 = event.getNumHatches();
+ hatching = event.isHatching();
+ hatchingType = event.getHatchingType();
2023-06-24 17:15:05 +10:00
+ // If hatching is set to false, ensure child count is 0
+ if (!hatching) {
+ b0 = 0;
+ }
+ }
2023-06-24 17:15:05 +10:00
+ // CraftBukkit end
+
for (int i = 0; i < b0; ++i) {
- EntityChicken entitychicken = (EntityChicken) EntityTypes.CHICKEN.create(this.level());
+ Entity entitychicken = this.level().getWorld().makeEntity(new org.bukkit.Location(this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F), hatchingType.getEntityClass()); // CraftBukkit
2023-06-24 17:15:05 +10:00
if (entitychicken != null) {
2022-12-08 03:00:00 +11:00
- entitychicken.setAge(-24000);
- entitychicken.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), 0.0F);
2023-06-08 01:30:00 +10:00
- this.level().addFreshEntity(entitychicken);
2023-06-24 17:15:05 +10:00
+ // CraftBukkit start
+ if (entitychicken.getBukkitEntity() instanceof Ageable) {
+ ((Ageable) entitychicken.getBukkitEntity()).setBaby();
2016-11-17 12:41:03 +11:00
+ }
2023-06-24 17:15:05 +10:00
+ this.level().addFreshEntity(entitychicken, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG);
+ // CraftBukkit end
2022-12-08 03:00:00 +11:00
}
2016-11-17 12:41:03 +11:00
}
}
this.level().broadcastEntityEvent(this, (byte) 3);
- this.discard();
+ this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
}
}