mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-14 14:45:40 +01:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
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));
|
|
}
|