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] KeYi: Add an option for spigot item merging mechanism

Original license: MIT
Original project: https://github.com/KeYiMC/KeYi

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 b77d112f74046cd35f17bada00a22402cb716482..881fe946c1046dd0421db98f628fcf6f0922e469 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -38,6 +38,7 @@ import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 // CraftBukkit end
 import org.bukkit.event.player.PlayerAttemptPickupItemEvent; // Paper
+import org.dreeam.leaf.LeafConfig;
 
 public class ItemEntity extends Entity implements TraceableEntity {
 
@@ -325,7 +326,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
         ItemStack itemstack1 = other.getItem();
 
         if (Objects.equals(this.target, other.target) && ItemEntity.areMergable(itemstack, itemstack1)) {
-            if (true || itemstack1.getCount() < itemstack.getCount()) { // Spigot
+            if (LeafConfig.useSpigotItemMergingMechanism || itemstack1.getCount() < itemstack.getCount()) { // Spigot // KeYi
                 ItemEntity.merge(this, itemstack, other, itemstack1);
             } else {
                 ItemEntity.merge(other, itemstack1, this, itemstack);
diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
index 984bed1917c9556775f13f0314a0a7c42ba17ba6..918631209956adae59b83dd28e7492290362311e 100644
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
@@ -187,11 +187,13 @@ public class LeafConfig {
     public static boolean tpsCatchup = true;
     public static boolean villagerLobotomizeEnabled = false;
     public static int villagerLobotomizeCheckInterval = 100;
+    public static boolean useSpigotItemMergingMechanism = true;
     private static void performance() {
         laggingThreshold = getDouble("performance.lagging-threshold", laggingThreshold);
         tpsCatchup = getBoolean("performance.tps-catchup", tpsCatchup);
         villagerLobotomizeEnabled = getBoolean("performance.villager.lobotomize.enabled", villagerLobotomizeEnabled);
         villagerLobotomizeCheckInterval = getInt("performance.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
+        useSpigotItemMergingMechanism = getBoolean("performance.use-spigot-item-merging-mechanism", useSpigotItemMergingMechanism);
     }
 
     public static String commandTPSBarOutput = "<green>Tpsbar toggled <onoff> for <target>";