From b1018e68081fd96a89e660747f336221aa7b8067 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sat, 12 Nov 2016 23:25:22 -0600 Subject: [PATCH] Filter bad block entity nbt data from falling blocks --- .../world/entity/item/FallingBlockEntity.java.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/paper-server/patches/sources/net/minecraft/world/entity/item/FallingBlockEntity.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/item/FallingBlockEntity.java.patch index 1c4abc0ace..336ebfaa2a 100644 --- a/paper-server/patches/sources/net/minecraft/world/entity/item/FallingBlockEntity.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/entity/item/FallingBlockEntity.java.patch @@ -108,3 +108,12 @@ this.callOnBrokenAfterFall(block, blockposition); } } +@@ -328,7 +356,7 @@ + this.dropItem = nbt.getBoolean("DropItem"); + } + +- if (nbt.contains("TileEntityData", 10)) { ++ if (nbt.contains("TileEntityData", 10) && !(this.level().paperConfig().entities.spawning.filterBadTileEntityNbtFromFallingBlocks && this.blockState.getBlock() instanceof net.minecraft.world.level.block.GameMasterBlock)) { // Paper - Filter bad block entity nbt data from falling blocks + this.blockData = nbt.getCompound("TileEntityData").copy(); + } +