From 12c970097d5044bf4124169745ad63efffc4a4ad Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Wed, 5 Jul 2023 09:46:12 +0200 Subject: [PATCH] Fix ThrownEggHatchEvent#setHatching (#9448) --- patches/server/0348-Add-ThrownEggHatchEvent.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/patches/server/0348-Add-ThrownEggHatchEvent.patch b/patches/server/0348-Add-ThrownEggHatchEvent.patch index 1ba4eabb97..aaf3812fef 100644 --- a/patches/server/0348-Add-ThrownEggHatchEvent.patch +++ b/patches/server/0348-Add-ThrownEggHatchEvent.patch @@ -7,17 +7,18 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem (dispensers can throw eggs to hatch them, too). diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java -index 88e8ce770ddc61702fc87cd8dcee498183dc1032..4aca131fe774c54b5cc274000d825687a1373b3f 100644 +index 88e8ce770ddc61702fc87cd8dcee498183dc1032..588e5ac6fc9b2d12be3bb80bc3fe50d81470c441 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEgg.java -@@ -82,6 +82,12 @@ public class ThrownEgg extends ThrowableItemProjectile { +@@ -82,6 +82,13 @@ public class ThrownEgg extends ThrowableItemProjectile { } } // CraftBukkit end + // Paper start + com.destroystokyo.paper.event.entity.ThrownEggHatchEvent event = new com.destroystokyo.paper.event.entity.ThrownEggHatchEvent((org.bukkit.entity.Egg) getBukkitEntity(), hatching, b0, hatchingType); + event.callEvent(); -+ b0 = event.getNumHatches(); ++ hatching = event.isHatching(); ++ b0 = hatching ? event.getNumHatches() : 0; // If hatching is set to false, ensure child count is 0 + hatchingType = event.getHatchingType(); + // Paper end