mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 21:47:55 +01:00
90fe0d58a5
Upstream has released updates that appear 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: 897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry 255b2aa1 SPIGOT-7080: Add World#locateNearestBiome ff984826 Remove javadoc.io doc links CraftBukkit Changes: 71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler 38c599f9d PR-1272: Only allow one entity in CraftItem instead of two f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld Spigot Changes: e0e223fe Remove javadoc.io doc links
21 lines
1.2 KiB
Diff
21 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 13 Aug 2021 15:00:06 -0700
|
|
Subject: [PATCH] Clear bucket NBT after dispense
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
|
index d500de41d0a61d67aff523fe436da06e625687dd..b5ea499b78970ec1575893e3b52900bf34feb3ec 100644
|
|
--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
|
+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
|
@@ -650,8 +650,7 @@ public interface DispenseItemBehavior {
|
|
Item item = Items.BUCKET;
|
|
stack.shrink(1);
|
|
if (stack.isEmpty()) {
|
|
- stack.setItem(Items.BUCKET);
|
|
- stack.setCount(1);
|
|
+ stack = new ItemStack(item); // Paper - clear tag
|
|
} else if (pointer.blockEntity().addItem(new ItemStack(item)) < 0) {
|
|
this.defaultDispenseItemBehavior.dispense(pointer, new ItemStack(item));
|
|
}
|