mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-03 14:22:26 +00:00
50 lines
2.8 KiB
Diff
50 lines
2.8 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] 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 8a52957ef46e68b31459bea5bbfcabdade69de20..18976e4b84146422daf262af469abcaff5e6fbbe 100644
|
|
--- a/src/main/java/org/dreeam/leaf/LeafConfig.java
|
|
+++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
|
|
@@ -190,6 +190,7 @@ public class LeafConfig {
|
|
public static int activationDistanceMod;
|
|
public static boolean throttleInactiveGoalSelectorTick;
|
|
public static Map<String, Integer> projectileTimeouts;
|
|
+ public static boolean useSpigotItemMergingMechanism = true;
|
|
private static void performance() {
|
|
String sentryEnvironment = System.getenv("SENTRY_DSN");
|
|
String sentryConfig = getString("performance.sentry-dsn", sentryDsn, "Sentry DSN for improved error logging, leave blank to disable", "Obtain from https://sentry.io/");
|
|
@@ -245,6 +246,7 @@ public class LeafConfig {
|
|
String type = EntityType.getKey(entityType).getPath().toUpperCase(Locale.ROOT);
|
|
entityType.ttl = config.getInt("entity_timeouts." + type, -1);
|
|
}
|
|
+ useSpigotItemMergingMechanism = getBoolean("performance.use-spigot-item-merging-mechanism", useSpigotItemMergingMechanism);
|
|
}
|
|
|
|
private static void network() {
|