37 lines
2.0 KiB
Diff
37 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: nostalgic853 <yuu8583@proton.me>
|
|
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 c93bb951fd456af9e8f030b6f5c7989925c3556f..2ccee00d230f4801c4ed4b80b8415a249e933133 100644
|
|
--- a/src/main/java/cc/keyimc/keyi/KeyiConfig.java
|
|
+++ b/src/main/java/cc/keyimc/keyi/KeyiConfig.java
|
|
@@ -149,6 +149,12 @@ public final class KeyiConfig {
|
|
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);
|
|
+ }
|
|
+
|
|
// Suki start - only refresh lootables for players
|
|
|
|
public static boolean onlyRefreshForPlayers = false;
|
|
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);
|