Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 14:33:56 +01:00
Code Issues Projects Releases Wiki Activity
2cb75d6cce
Paper/Spigot-Server-Patches/0347-Allow-chests-to-be-placed-with-NBT-data.patch

35 lines
1.6 KiB
Diff
Raw Normal View History

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 16:23:05 +02:00
From ebd98949f3593794792e66a108d3ad296b7c40be 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 18:53:23 +02: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 03:57:59 +02:00
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
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 16:23:05 +02:00
index f34ac392e1..eb130c0121 100644
Fix cancelled lootables (#1510)
2018-09-30 03:57:59 +02:00
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
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 16:23:05 +02:00
@@ -241,6 +241,7 @@ public final class ItemStack {
Fix cancelled lootables (#1510)
2018-09-30 03:57:59 +02: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 16:23:05 +02:00
+ world.capturedTileEntities.clear(); // Paper - clear out tile entities as chests and such will pop loot
Fix cancelled lootables (#1510)
2018-09-30 03:57:59 +02: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 18:53:23 +02:00
diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
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 16:23:05 +02:00
index c46b761cc5..2e0f782f65 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 18:53:23 +02:00
--- 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
// CraftBukkit start
@Override
public boolean isFilteredNBT() {
- return true;
+ return false; // Paper
}
// CraftBukkit end
}
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 01:28:15 +01:00
2.21.0
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 18:53:23 +02:00
Reference in New Issue Copy Permalink