mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 12:36:07 +01:00
e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
From 9bf99cd290145fe1b957bd023d69559190eb6102 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/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java
|
|
index b6b7e3c6c9..3af686c7f1 100644
|
|
--- a/src/main/java/net/minecraft/server/IDispenseBehavior.java
|
|
+++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java
|
|
@@ -265,7 +265,7 @@ public interface IDispenseBehavior {
|
|
}
|
|
|
|
itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
|
|
- EntityFireworks entityfireworks = new EntityFireworks(isourceblock.getWorld(), itemstack, d3, d4, d5, true);
|
|
+ EntityFireworks entityfireworks = new EntityFireworks(isourceblock.getWorld(), itemstack1, d3, d4, d5, true); // Paper - GH-2871 - fix last firework in stack having no effects when dispensed
|
|
|
|
entityfireworks.shoot(d0, d1, d2, 0.5F, 1.0F);
|
|
isourceblock.getWorld().addEntity(entityfireworks);
|
|
--
|
|
2.25.1
|
|
|