mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
24 lines
1.6 KiB
Diff
24 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||
|
|
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 67a894a185a3d4a53b3c7f90174b2604dff18257..67d140dff483bfc654a0390e0cdcd13aa658a62d 100644
|
||
|
|
--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
||
|
|
+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
||
|
|
@@ -425,7 +425,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);
|