From cee1175c2dc6ceff226a6c8dec39adb07b9ff7ba Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Tue, 24 Oct 2023 13:01:00 -0400 Subject: [PATCH] Add comment for cache minecart collision config --- .../0031-Cache-minecart-vehicle-collision-results.patch | 8 +++++--- ...34-Faster-Random-for-xaeroMapServerID-generation.patch | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/patches/server/0031-Cache-minecart-vehicle-collision-results.patch b/patches/server/0031-Cache-minecart-vehicle-collision-results.patch index eb980fc36..d8b90c61a 100644 --- a/patches/server/0031-Cache-minecart-vehicle-collision-results.patch +++ b/patches/server/0031-Cache-minecart-vehicle-collision-results.patch @@ -63,7 +63,7 @@ index faf449dfb4f95a300796db46833f3b6a51cb961b..847bf9edd3f3dbd5c9fd4de4973ac066 while (iterator1.hasNext()) { Entity entity1 = (Entity) iterator1.next(); diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 839b4dba682b67f4ea291717d45d973c84cd3612..2253c44a8532fbc984d97a0067267580788d5d5f 100644 +index 839b4dba682b67f4ea291717d45d973c84cd3612..c994424d11747484f45c0bc76d947b080ce83394 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java @@ -188,6 +188,7 @@ public class LeafConfig { @@ -74,11 +74,13 @@ index 839b4dba682b67f4ea291717d45d973c84cd3612..2253c44a8532fbc984d97a0067267580 private static void performance() { useSpigotItemMergingMechanism = getBoolean("performance.use-spigot-item-merging-mechanism", useSpigotItemMergingMechanism); asyncPathfinding = getBoolean("performance.async-pathfinding.enable", asyncPathfinding); -@@ -201,6 +202,7 @@ public class LeafConfig { +@@ -201,6 +202,9 @@ public class LeafConfig { asyncPathfindingMaxThreads = 0; else Bukkit.getLogger().log(Level.INFO, "Using " + asyncPathfindingMaxThreads + " threads for Async Pathfinding"); -+ cacheMinecartCollision = getBoolean("performance.cache-minecart-collision", cacheMinecartCollision); ++ cacheMinecartCollision = getBoolean("performance.cache-minecart-collision", cacheMinecartCollision, ++ "Cache the minecart collision result to prevent massive stacked minecart lag the server.", ++ "The known issue: entity can't enter the minecart after enabling this!"); } public static boolean jadeProtocol = false; diff --git a/patches/server/0034-Faster-Random-for-xaeroMapServerID-generation.patch b/patches/server/0034-Faster-Random-for-xaeroMapServerID-generation.patch index 65b0d356e..65ceccd7a 100644 --- a/patches/server/0034-Faster-Random-for-xaeroMapServerID-generation.patch +++ b/patches/server/0034-Faster-Random-for-xaeroMapServerID-generation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Faster Random for xaeroMapServerID generation diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 2253c44a8532fbc984d97a0067267580788d5d5f..3b2ed47f3ad717817afbd7d24f0d926a7396337e 100644 +index c994424d11747484f45c0bc76d947b080ce83394..7a9f95d0ab3a3e57e8df8c2587d35691fbe90b54 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java @@ -1,7 +1,7 @@ @@ -17,7 +17,7 @@ index 2253c44a8532fbc984d97a0067267580788d5d5f..3b2ed47f3ad717817afbd7d24f0d926a import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; -@@ -208,7 +208,7 @@ public class LeafConfig { +@@ -210,7 +210,7 @@ public class LeafConfig { public static boolean jadeProtocol = false; public static boolean appleskinProtocol = false; public static boolean xaeroMapProtocol = false;