From a09f1713bfa257e7ca0da861e14aebbf4009645e Mon Sep 17 00:00:00 2001 From: booky10 <53302036+booky10@users.noreply.github.com> Date: Wed, 4 Oct 2023 03:29:44 +0200 Subject: [PATCH] Fix entity data not updated for firework attached to entity (#9783) --- ...ta-when-attaching-firework-to-entity.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 patches/server/Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/Update-entity-data-when-attaching-firework-to-entity.patch new file mode 100644 index 0000000000..44a0fd245b --- /dev/null +++ b/patches/server/Update-entity-data-when-attaching-firework-to-entity.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: booky10 +Date: Sun, 27 Aug 2023 16:11:31 +0200 +Subject: [PATCH] Update entity data when attaching firework to entity + +== AT == +public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ATTACHED_TO_TARGET + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +@@ -0,0 +0,0 @@ public class CraftFirework extends CraftProjectile implements Firework { + } + + this.getHandle().attachedToEntity = (entity != null) ? ((CraftLivingEntity) entity).getHandle() : null; ++ // Paper start - update entity data ++ this.getHandle().getEntityData().set(FireworkRocketEntity.DATA_ATTACHED_TO_TARGET, ++ entity != null ? java.util.OptionalInt.of(entity.getEntityId()) : java.util.OptionalInt.empty()); ++ // Paper end + return true; + } +