2019-12-13 20:41:01 +00:00
|
|
|
From 1b80a8b0485c770ffc0e7a9a211d513b63d49755 Mon Sep 17 00:00:00 2001
|
Allow chests to be placed with NBT (#1425)
This restores vanilla behavior of allowing placed chests to retain any Block Entity Tag data.
Upstream added filtering to chests, breaking vanilla behavior, and preventing use of loot table chests as a reward mechanism.
Upon review, we can find no security risk in allowing players to place a chest with NBT data, as Spawn Eggs, Minecarts, command blocks etc all have their own checks.
Additionally, survival mode players, non op players can not create these items anyways. If a player has Creative or Op, they already have high levels of access.
Plus, Chests aren't the only inventory that could have free form items, so this filter was insufficient anyways.
2018-09-09 16:53:23 +00:00
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
|
Date: Sat, 8 Sep 2018 18:43:31 -0500
|
|
|
|
|
Subject: [PATCH] Allow chests to be placed with NBT data
|
|
|
|
|
|
|
|
|
|
|
2018-09-30 01:57:59 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
2019-12-13 20:41:01 +00:00
|
|
|
index 33d9cac4d..d891e7b0e 100644
|
2018-09-30 01:57:59 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
2019-12-12 16:20:43 +00:00
|
|
|
@@ -240,6 +240,7 @@ public final class ItemStack {
|
2018-09-30 01:57:59 +00:00
|
|
|
enuminteractionresult = EnumInteractionResult.FAIL; // cancel placement
|
|
|
|
|
// PAIL: Remove this when MC-99075 fixed
|
|
|
|
|
placeEvent.getPlayer().updateInventory();
|
2019-04-06 14:23:05 +00:00
|
|
|
+ world.capturedTileEntities.clear(); // Paper - clear out tile entities as chests and such will pop loot
|
2018-09-30 01:57:59 +00:00
|
|
|
// revert back all captured blocks
|
|
|
|
|
for (BlockState blockstate : blocks) {
|
|
|
|
|
blockstate.update(true, false);
|
Allow chests to be placed with NBT (#1425)
This restores vanilla behavior of allowing placed chests to retain any Block Entity Tag data.
Upstream added filtering to chests, breaking vanilla behavior, and preventing use of loot table chests as a reward mechanism.
Upon review, we can find no security risk in allowing players to place a chest with NBT data, as Spawn Eggs, Minecarts, command blocks etc all have their own checks.
Additionally, survival mode players, non op players can not create these items anyways. If a player has Creative or Op, they already have high levels of access.
Plus, Chests aren't the only inventory that could have free form items, so this filter was insufficient anyways.
2018-09-09 16:53:23 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
|
2019-12-12 16:20:43 +00:00
|
|
|
index c4766f729..b22bd06e2 100644
|
Allow chests to be placed with NBT (#1425)
This restores vanilla behavior of allowing placed chests to retain any Block Entity Tag data.
Upstream added filtering to chests, breaking vanilla behavior, and preventing use of loot table chests as a reward mechanism.
Upon review, we can find no security risk in allowing players to place a chest with NBT data, as Spawn Eggs, Minecarts, command blocks etc all have their own checks.
Additionally, survival mode players, non op players can not create these items anyways. If a player has Creative or Op, they already have high levels of access.
Plus, Chests aren't the only inventory that could have free form items, so this filter was insufficient anyways.
2018-09-09 16:53:23 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/TileEntityChest.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityChest.java
|
2019-12-12 16:20:43 +00:00
|
|
|
@@ -292,7 +292,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
|
Allow chests to be placed with NBT (#1425)
This restores vanilla behavior of allowing placed chests to retain any Block Entity Tag data.
Upstream added filtering to chests, breaking vanilla behavior, and preventing use of loot table chests as a reward mechanism.
Upon review, we can find no security risk in allowing players to place a chest with NBT data, as Spawn Eggs, Minecarts, command blocks etc all have their own checks.
Additionally, survival mode players, non op players can not create these items anyways. If a player has Creative or Op, they already have high levels of access.
Plus, Chests aren't the only inventory that could have free form items, so this filter was insufficient anyways.
2018-09-09 16:53:23 +00:00
|
|
|
// CraftBukkit start
|
|
|
|
|
@Override
|
|
|
|
|
public boolean isFilteredNBT() {
|
|
|
|
|
- return true;
|
|
|
|
|
+ return false; // Paper
|
|
|
|
|
}
|
|
|
|
|
// CraftBukkit end
|
|
|
|
|
}
|
|
|
|
|
--
|
2019-12-13 20:41:01 +00:00
|
|
|
2.24.1
|
Allow chests to be placed with NBT (#1425)
This restores vanilla behavior of allowing placed chests to retain any Block Entity Tag data.
Upstream added filtering to chests, breaking vanilla behavior, and preventing use of loot table chests as a reward mechanism.
Upon review, we can find no security risk in allowing players to place a chest with NBT data, as Spawn Eggs, Minecarts, command blocks etc all have their own checks.
Additionally, survival mode players, non op players can not create these items anyways. If a player has Creative or Op, they already have high levels of access.
Plus, Chests aren't the only inventory that could have free form items, so this filter was insufficient anyways.
2018-09-09 16:53:23 +00:00
|
|
|
|
