From 32d95e9bab7ff60bdd738eb71adf3c11052c10d3 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Wed, 26 Oct 2022 17:44:28 -0700 Subject: [PATCH] Track projectile source for fireworks from dispensers (#8044) --- ...e-source-for-fireworks-from-dispenser.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 patches/server/0934-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0934-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0934-Track-projectile-source-for-fireworks-from-dispenser.patch new file mode 100644 index 0000000000..79d456a58f --- /dev/null +++ b/patches/server/0934-Track-projectile-source-for-fireworks-from-dispenser.patch @@ -0,0 +1,18 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Thu, 23 Jun 2022 19:25:51 -0700 +Subject: [PATCH] Track projectile source for fireworks from dispensers + + +diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java +index 3d2b5f040715a0e4fac0e6786bd11a4d715330ce..9d601bf258a6d209a889afa7ba7f839c01f83cd8 100644 +--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java ++++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java +@@ -511,6 +511,7 @@ public interface DispenseItemBehavior { + + itemstack1 = CraftItemStack.asNMSCopy(event.getItem()); + FireworkRocketEntity entityfireworks = new FireworkRocketEntity(pointer.getLevel(), itemstack1, pointer.x(), pointer.y(), pointer.x(), true); // Paper - GH-2871 - fix last firework in stack having no effects when dispensed ++ entityfireworks.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(pointer.getEntity()); // Paper - track projectile source for fireworks + + DispenseItemBehavior.setEntityPokingOutOfBlock(pointer, entityfireworks, enumdirection); + entityfireworks.shoot((double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), 0.5F, 1.0F);