mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-02 17:01:38 +01:00
28 lines
1.6 KiB
Diff
28 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: lexikiq <noellekiq@gmail.com>
|
||
|
|
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 d123bd7095355dff84b9859657e24258c5a204e3..e46a0afa45ee771a0114703acc314d7cf8e8ffed 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
|
||
|
|
@@ -62,9 +62,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();
|