aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch')
-rw-r--r--patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch
new file mode 100644
index 0000000000..448854642c
--- /dev/null
+++ b/patches/server/0344-Fix-last-firework-in-stack-not-having-effects-when-d.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <[email protected]>
+Date: Fri, 17 Jan 2020 18:44:55 -0800
+Subject: [PATCH] Fix last firework in stack not having effects when dispensed
+ - #2871
+
+CB used the resulting item in the dispenser rather than the item
+dispensed. The resulting item would have size == 0 and therefore
+be convertered to air, hence why the effects disappeared.
+
+diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
+index 6219b89cf04febe0a8ceb93b4212827c297cf7aa..15fc100e468e68cbb0c43363c0eb25dc2ef8c6e0 100644
+--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
++++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
+@@ -510,7 +510,7 @@ public interface DispenseItemBehavior {
+ }
+
+ itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
+- FireworkRocketEntity entityfireworks = new FireworkRocketEntity(pointer.getLevel(), stack, pointer.x(), pointer.y(), pointer.x(), true);
++ 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
+
+ DispenseItemBehavior.setEntityPokingOutOfBlock(pointer, entityfireworks, enumdirection);
+ entityfireworks.shoot((double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), 0.5F, 1.0F);