Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
bc127ea Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6222)
This commit is contained in:
William Blake Galbreath
2021-07-18 10:54:06 -05:00
parent 47748b9b22
commit 11a81818be
3 changed files with 5 additions and 5 deletions

View File

@@ -7,10 +7,10 @@ Makes it so that when a TileEntity is placed in the world and then broken,
the dropped ItemStack retains any original custom display name/lore.
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
index 44b28773fe8e79931e738d493bd9405e0ee3dca9..d9114ee2ef4f1dee7ae018f932a7804a61a90ef6 100644
index 8e6df16568c0dab482e10ad1b38920d77f6e684f..6c261b9ddee80139140bd1f091fcdacc3a70c8ef 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -133,7 +133,24 @@ public class BlockItem extends Item {
@@ -137,7 +137,24 @@ public class BlockItem extends Item {
}
protected boolean updateCustomBlockEntityTag(BlockPos pos, Level world, @Nullable Player player, ItemStack stack, BlockState state) {