aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0621-Preserve-overstacked-loot.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0621-Preserve-overstacked-loot.patch')
-rw-r--r--patches/server/0621-Preserve-overstacked-loot.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/patches/server/0621-Preserve-overstacked-loot.patch b/patches/server/0621-Preserve-overstacked-loot.patch
new file mode 100644
index 0000000000..bd657ec906
--- /dev/null
+++ b/patches/server/0621-Preserve-overstacked-loot.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: lexikiq <[email protected]>
+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 b231f90317fe7df9133674b12d47873520b481cb..edaf7f1692ae059581f3abc24bb228874e6d114b 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
+@@ -72,9 +72,10 @@ public class LootTable {
+ }
+
+ public static Consumer<ItemStack> createStackSplitter(ServerLevel world, Consumer<ItemStack> 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();