core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0287-Allow-chests-to-be-pla...

32 lines
1.7 KiB
Diff
Raw Normal View History

Rebuild all patches using the new rebuild pattern
2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 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
Fix cancelled lootables (#1510)
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
even even even more work
2020-06-25 14:09:55 +00:00
index 95e801a9a7ca405ff7e80c920fa78493d0ef5374..a075a41d954836864a5186b383e967a9ac262df8 100644
Fix cancelled lootables (#1510)
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
even even even more work
2020-06-25 14:09:55 +00:00
@@ -244,6 +244,7 @@ public final class ItemStack {
Fix cancelled lootables (#1510)
2018-09-30 01:57:59 +00:00
enuminteractionresult = EnumInteractionResult.FAIL; // cancel placement
// PAIL: Remove this when MC-99075 fixed
placeEvent.getPlayer().updateInventory();
Improve Cancelled Block Place Tile Entity discardment We bandaided this logic on a case by case basis before with Loot Tables and Chests, but that is not the correct fix. Ultimately we just needed to clear out the captured tile entity list so that the update calls did not process the tile entity that is no longer even valid. This solution will ensure ALL placed tile entities data is ignored and not just the few cases we previously had filters for.
2019-04-06 14:23:05 +00:00
+ world.capturedTileEntities.clear(); // Paper - clear out tile entities as chests and such will pop loot
Fix cancelled lootables (#1510)
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
Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 983305bb SPIGOT-5856: Soul Campfire BlockState cannot be cast to Campfire
2020-06-27 21:37:09 +00:00
index a016d97be93c4218136f803cc9a7f986d70309d2..f6f2743892b5b933e6ba0cc25b24e0d471b305c9 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
Houston, we got a patch (#2731) * Houston, we got a patch * is this the end of the beginning or the beginning of the end
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
}