From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: lexikiq Date: Mon, 21 Jun 2021 23:21:58 -0400 Subject: [PATCH] Preserve overstacked loot Preserves overstacked items in loot tables, such as shulker box drops, to prevent the items from being deleted (as they'd overflow past the bounds of the container)-- or worse, causing chunk bans via the large amount of NBT created by unstacking the items. Fixes GH-5140 and GH-4748. diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java index c21dd258d749c28e509c86a70c1f85712aeeda9e..5373070034cefbbfa797c675ce698637b526a2c8 100644 --- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java +++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java @@ -67,9 +67,10 @@ public class LootTable { } public static Consumer createStackSplitter(ServerLevel world, Consumer consumer) { + boolean skipSplitter = world != null && !world.paperConfig().fixes.splitOverstackedLoot; // Paper - preserve overstacked items return (itemstack) -> { if (itemstack.isItemEnabled(world.enabledFeatures())) { - if (itemstack.getCount() < itemstack.getMaxStackSize()) { + if (skipSplitter || itemstack.getCount() < itemstack.getMaxStackSize()) { // Paper - preserve overstacked items consumer.accept(itemstack); } else { int i = itemstack.getCount();