From c81736fd6096309bed3edcdb10cf67f953b34405 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 29 Sep 2018 20:57:59 -0500 Subject: [PATCH] Fix cancelled lootables (#1510) --- ...ow-chests-to-be-placed-with-NBT-data.patch | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch index 8f5a639ac..f4f9cefee 100644 --- a/Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0360-Allow-chests-to-be-placed-with-NBT-data.patch @@ -1,11 +1,31 @@ -From 82a16bea42eb290e7b63fc376477140857a71bf6 Mon Sep 17 00:00:00 2001 +From fa57591b3691f5cb5f754fc423ecbcb78eacc41b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Sep 2018 18:43:31 -0500 Subject: [PATCH] Allow chests to be placed with NBT data +diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java +index 4641113f9..26055924b 100644 +--- a/src/main/java/net/minecraft/server/ItemStack.java ++++ b/src/main/java/net/minecraft/server/ItemStack.java +@@ -228,6 +228,15 @@ public final class ItemStack { + enuminteractionresult = EnumInteractionResult.FAIL; // cancel placement + // PAIL: Remove this when MC-99075 fixed + placeEvent.getPlayer().updateInventory(); ++ ++ // Paper start ++ for (Map.Entry e : world.capturedTileEntities.entrySet()) { ++ if (e.getValue() instanceof TileEntityLootable) { ++ ((TileEntityLootable) e.getValue()).setLootTable(null); ++ } ++ } ++ // Paper end ++ + // revert back all captured blocks + for (BlockState blockstate : blocks) { + blockstate.update(true, false); diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index 9573a4ecdf..7594c16e99 100644 +index 9573a4ecd..7594c16e9 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -305,7 +305,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic