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

43 lines
1.8 KiB
Diff
Raw Normal View History

More improvements to activation range, improve turtles improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
2018-10-05 03:18:46 +00:00
From df899b98ec5b314f89684d81f48312bb7d27511c 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
More improvements to activation range, improve turtles improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
2018-10-05 03:18:46 +00:00
index 4641113f9d..26055924b9 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
@@ -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<BlockPosition, TileEntity> 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);
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
More improvements to activation range, improve turtles improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
2018-10-05 03:18:46 +00:00
index 9573a4ecdf..7594c16e99 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
@@ -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
}
--
Expose attack cooldown methods for Player (#1412)
2018-09-23 03:03:53 +00:00
2.19.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 16:53:23 +00:00