From 751d95c2fefdd03946dbf23ec5ff239a0e9f3e70 Mon Sep 17 00:00:00 2001 From: nostalgic853 Date: Sun, 23 Oct 2022 23:22:01 +0800 Subject: [PATCH] Add an option for spigot item merging mechanism --- ...on-for-spigot-item-merging-mechanism.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 patches/server/0016-Add-an-option-for-spigot-item-merging-mechanism.patch diff --git a/patches/server/0016-Add-an-option-for-spigot-item-merging-mechanism.patch b/patches/server/0016-Add-an-option-for-spigot-item-merging-mechanism.patch new file mode 100644 index 0000000..d52f836 --- /dev/null +++ b/patches/server/0016-Add-an-option-for-spigot-item-merging-mechanism.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: nostalgic853 +Date: Sun, 23 Oct 2022 23:21:45 +0800 +Subject: [PATCH] Add an option for spigot item merging mechanism + + +diff --git a/src/main/java/cc/keyimc/keyi/KeyiConfig.java b/src/main/java/cc/keyimc/keyi/KeyiConfig.java +index 8884a2471b4b7c5cabf1c0c767710ba69c7ae4ec..4f08f2e40f5bc3bc5a87bf3a34945afdec65f288 100644 +--- a/src/main/java/cc/keyimc/keyi/KeyiConfig.java ++++ b/src/main/java/cc/keyimc/keyi/KeyiConfig.java +@@ -148,4 +148,10 @@ public final class KeyiConfig { + private static void fixes() { + fixTripwireDuping = getBoolean("fixes.fix-tripwire-duping", fixTripwireDuping); + } ++ ++ public static boolean useSpigotItemMergingMechanism = true; ++ ++ private static void performance() { ++ useSpigotItemMergingMechanism = getBoolean("performance.use-spigot-item-merging-mechanism", useSpigotItemMergingMechanism); ++ } + } +\ No newline at end of file +diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +index aa1c929d948cea8f6212330f922eb5f1d9b9bb97..bb72741300cedd1c37fc5611c6472292bdf245a1 100644 +--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java ++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +@@ -291,7 +291,7 @@ public class ItemEntity extends Entity { + ItemStack itemstack1 = other.getItem(); + + if (Objects.equals(this.getOwner(), other.getOwner()) && ItemEntity.areMergable(itemstack, itemstack1)) { +- if (true || itemstack1.getCount() < itemstack.getCount()) { // Spigot ++ if (cc.keyimc.keyi.KeyiConfig.useSpigotItemMergingMechanism || itemstack1.getCount() < itemstack.getCount()) { // Spigot // KeYi + ItemEntity.merge(this, itemstack, other, itemstack1); + } else { + ItemEntity.merge(other, itemstack1, this, itemstack);