diff --git a/patches/server/0002-Leaf-Config.patch b/patches/server/0002-Leaf-Config.patch index 5ff8e0a9..e1eb7f09 100644 --- a/patches/server/0002-Leaf-Config.patch +++ b/patches/server/0002-Leaf-Config.patch @@ -64,12 +64,13 @@ index 1141b3a88e2eb1baa705b4f781353df0305a7c85..b104a38d2c879b649a3862876c389564 this.setFlightAllowed(dedicatedserverproperties.allowFlight); diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..309391c1da5ed895e9bf16361ec78944801a22d3 +index 0000000000000000000000000000000000000000..511bc2175c4f25723bfdf59ae0ecb20e6fff1956 --- /dev/null +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -0,0 +1,139 @@ +@@ -0,0 +1,167 @@ +package org.dreeam.leaf; + ++import com.google.common.collect.ImmutableMap; +import net.minecraft.server.MinecraftServer; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.MemoryConfiguration; @@ -83,6 +84,7 @@ index 0000000000000000000000000000000000000000..309391c1da5ed895e9bf16361ec78944 +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.List; ++import java.util.Map; + +public class LeafConfig { + @@ -157,6 +159,11 @@ index 0000000000000000000000000000000000000000..309391c1da5ed895e9bf16361ec78944 + } + } + ++ private static void set(String key, Object defaultValue) { ++ config.addDefault(key, defaultValue); ++ config.set(key, defaultValue); ++ } ++ + private static boolean getBoolean(String key, boolean defaultValue, String... comment) { + return getBoolean(key, null, defaultValue, comment); + } @@ -202,6 +209,27 @@ index 0000000000000000000000000000000000000000..309391c1da5ed895e9bf16361ec78944 + return config.getStringList(key); + } + ++ static Map getMap(String key, Map defaultValue) { ++ if (defaultValue != null && config.getConfigurationSection(key) == null) { ++ config.addDefault(key, defaultValue); ++ return defaultValue; ++ } ++ return toMap(convertToBukkit(config.getConfigurationSection(key))); ++ } ++ ++ private static Map toMap(ConfigurationSection section) { ++ ImmutableMap.Builder builder = ImmutableMap.builder(); ++ if (section != null) { ++ for (String key : section.getKeys(false)) { ++ Object obj = section.get(key); ++ if (obj != null) { ++ builder.put(key, obj instanceof ConfigurationSection val ? toMap(val) : obj); ++ } ++ } ++ } ++ return builder.build(); ++ } ++ + public static String serverModName = "Leaf"; + private static void serverModName() { + serverModName = getString("server-mod-name", serverModName); diff --git a/patches/server/0004-Remove-Mojang-username-check.patch b/patches/server/0004-Remove-Mojang-username-check.patch index a3b1ff0f..8fa3b410 100644 --- a/patches/server/0004-Remove-Mojang-username-check.patch +++ b/patches/server/0004-Remove-Mojang-username-check.patch @@ -30,15 +30,10 @@ index 9b924f0793d8231244c160a5bc7ac8e1a35bad34..e9718dff0e81b474eebded583da6f47d ServerLoginPacketListenerImpl.this.disconnect("Failed to verify username!"); return; diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 309391c1da5ed895e9bf16361ec78944801a22d3..434e3de4872a660725cf0bd462c97383f6915ed1 100644 +index 511bc2175c4f25723bfdf59ae0ecb20e6fff1956..64d105330644aedabff26ba359597b8621bc02c5 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -132,8 +132,16 @@ public class LeafConfig { - return config.getStringList(key); - } - -+ - public static String serverModName = "Leaf"; +@@ -164,4 +164,11 @@ public class LeafConfig { private static void serverModName() { serverModName = getString("server-mod-name", serverModName); } diff --git a/patches/server/0005-Remove-Spigot-Check-for-Broken-BungeeCord-Configurat.patch b/patches/server/0005-Remove-Spigot-Check-for-Broken-BungeeCord-Configurat.patch index 7e3c5aa6..a5f50200 100644 --- a/patches/server/0005-Remove-Spigot-Check-for-Broken-BungeeCord-Configurat.patch +++ b/patches/server/0005-Remove-Spigot-Check-for-Broken-BungeeCord-Configurat.patch @@ -26,17 +26,10 @@ index 8e68d1373a519cc12bf83de6aadcb24cbbd34af6..4b07c53efffff8c8c88e13c0c890eff8 this.connection.send(new ClientboundLoginDisconnectPacket(chatmessage)); this.connection.disconnect(chatmessage); diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 434e3de4872a660725cf0bd462c97383f6915ed1..20ea046501763954eb97045d33101e6b043bc84d 100644 +index 64d105330644aedabff26ba359597b8621bc02c5..9f5150c9e75cd01cbcdce8e359f4df5d4de621d1 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -132,16 +132,19 @@ public class LeafConfig { - return config.getStringList(key); - } - -- - public static String serverModName = "Leaf"; - private static void serverModName() { - serverModName = getString("server-mod-name", serverModName); +@@ -166,9 +166,13 @@ public class LeafConfig { } public static boolean removeMojangUsernameCheck = true; diff --git a/patches/server/0007-Remove-UseItemOnPacket-Too-Far-Check.patch b/patches/server/0007-Remove-UseItemOnPacket-Too-Far-Check.patch index 6944e763..0d703bda 100644 --- a/patches/server/0007-Remove-UseItemOnPacket-Too-Far-Check.patch +++ b/patches/server/0007-Remove-UseItemOnPacket-Too-Far-Check.patch @@ -28,10 +28,10 @@ index 8fd2a0a9f3990742c17d471b143c672163eb76aa..4ff68ff8b4e442a6b6a132eefedd8887 this.player.resetLastActionTime(); diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 20ea046501763954eb97045d33101e6b043bc84d..344b1a599dab2de022dee0ed26006e7eb7c5c70c 100644 +index 9f5150c9e75cd01cbcdce8e359f4df5d4de621d1..e79c612336d609ca4182c97adaa7cef02a50c93f 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -139,6 +139,8 @@ public class LeafConfig { +@@ -167,6 +167,8 @@ public class LeafConfig { public static boolean removeMojangUsernameCheck = true; public static boolean removeSpigotCheckBungeeConfig = true; @@ -40,7 +40,7 @@ index 20ea046501763954eb97045d33101e6b043bc84d..344b1a599dab2de022dee0ed26006e7e private static void removeConfig() { removeMojangUsernameCheck = getBoolean("remove-Mojang-username-check", removeMojangUsernameCheck, "Remove username check of Mojang", -@@ -146,5 +148,8 @@ public class LeafConfig { +@@ -174,5 +176,8 @@ public class LeafConfig { removeSpigotCheckBungeeConfig = getBoolean("remove-Spigot-check-bungee-config", removeSpigotCheckBungeeConfig, "Enable player enter backend server through proxy", "without backend server enabling its bungee mode"); diff --git a/patches/server/0009-Purpur-Implement-TPSBar.patch b/patches/server/0009-Purpur-Implement-TPSBar.patch index f8739e74..de2f258f 100644 --- a/patches/server/0009-Purpur-Implement-TPSBar.patch +++ b/patches/server/0009-Purpur-Implement-TPSBar.patch @@ -182,12 +182,13 @@ index 6035af2cf08353b3d3801220d8116d8611a0cd37..7774ab6a2e553a40def4bb4dceea9e5f final String commandName; if (vanillaCommand.getRedirect() == null) { diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 344b1a599dab2de022dee0ed26006e7eb7c5c70c..f8b3f9cca444ef457118edc57b3ff08b1ed1ac40 100644 +index e79c612336d609ca4182c97adaa7cef02a50c93f..0bc65b128f52fca34017c579bd31f13fe89c5ec9 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -1,8 +1,10 @@ +@@ -1,9 +1,11 @@ package org.dreeam.leaf; + import com.google.common.collect.ImmutableMap; +import net.kyori.adventure.bossbar.BossBar; import net.minecraft.server.MinecraftServer; import org.bukkit.configuration.ConfigurationSection; @@ -196,7 +197,7 @@ index 344b1a599dab2de022dee0ed26006e7eb7c5c70c..f8b3f9cca444ef457118edc57b3ff08b import org.jetbrains.annotations.Nullable; import org.simpleyaml.configuration.comments.CommentType; import org.simpleyaml.configuration.file.YamlFile; -@@ -152,4 +154,30 @@ public class LeafConfig { +@@ -180,4 +182,30 @@ public class LeafConfig { "To enable this, players can use some packet modules with hack clients and the NoCom Exploit!!"); maxUseItemDistance = getDouble("max-UseItem-distance", maxUseItemDistance, "The max distance of UseItem for players"); } diff --git a/patches/server/0010-Purpur-Add-compass-command.patch b/patches/server/0010-Purpur-Add-compass-command.patch index 434cc829..fc31e43c 100644 --- a/patches/server/0010-Purpur-Add-compass-command.patch +++ b/patches/server/0010-Purpur-Add-compass-command.patch @@ -61,10 +61,10 @@ index 39a0bd651736c80cc558775d94794ee020c574a8..09667820e41ef9c4e3aef9e2c8d18eb6 // Purpur end } diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index f8b3f9cca444ef457118edc57b3ff08b1ed1ac40..02272d03d84d1c5c9133d30eb1de58715130d259 100644 +index 0bc65b128f52fca34017c579bd31f13fe89c5ec9..178891c37d9dea00329dee1fb8d413ec4bb77cb6 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -166,6 +166,11 @@ public class LeafConfig { +@@ -194,6 +194,11 @@ public class LeafConfig { public static String commandTPSBarTextColorMedium = ""; public static String commandTPSBarTextColorLow = ""; public static int commandTPSBarTickInterval = 20; @@ -76,7 +76,7 @@ index f8b3f9cca444ef457118edc57b3ff08b1ed1ac40..02272d03d84d1c5c9133d30eb1de5871 private static void commandSettings() { commandTPSBarOutput = getString("command.messages.tpsbar-command-output", commandTPSBarOutput); -@@ -179,5 +184,16 @@ public class LeafConfig { +@@ -207,5 +212,16 @@ public class LeafConfig { commandTPSBarTextColorMedium = getString("command.tpsbar.text-color.medium", commandTPSBarTextColorMedium); commandTPSBarTextColorLow = getString("command.tpsbar.text-color.low", commandTPSBarTextColorLow); commandTPSBarTickInterval = getInt("command.tpsbar.tick-interval", commandTPSBarTickInterval); diff --git a/patches/server/0011-Purpur-Implement-ram-and-rambar-commands.patch b/patches/server/0011-Purpur-Implement-ram-and-rambar-commands.patch index 19580354..e075f6f3 100644 --- a/patches/server/0011-Purpur-Implement-ram-and-rambar-commands.patch +++ b/patches/server/0011-Purpur-Implement-ram-and-rambar-commands.patch @@ -63,10 +63,10 @@ index 09667820e41ef9c4e3aef9e2c8d18eb6aa0bdc1e..05ef07550dae98170a71968673addf9b // Purpur end } diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 02272d03d84d1c5c9133d30eb1de58715130d259..728edf151d248ed9a36cab42e88d68aa398f0569 100644 +index 178891c37d9dea00329dee1fb8d413ec4bb77cb6..95131d2fb1b2fff8fe787498ab4d9fbbdf970118 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -171,6 +171,17 @@ public class LeafConfig { +@@ -199,6 +199,17 @@ public class LeafConfig { public static BossBar.Color commandCompassBarProgressColor = BossBar.Color.BLUE; public static float commandCompassBarProgressPercent = 1.0F; public static int commandCompassBarTickInterval = 5; @@ -84,7 +84,7 @@ index 02272d03d84d1c5c9133d30eb1de58715130d259..728edf151d248ed9a36cab42e88d68aa private static void commandSettings() { commandTPSBarOutput = getString("command.messages.tpsbar-command-output", commandTPSBarOutput); -@@ -190,6 +201,18 @@ public class LeafConfig { +@@ -218,6 +229,18 @@ public class LeafConfig { commandCompassBarProgressColor = BossBar.Color.valueOf(getString("command.compass.progress-color", commandCompassBarProgressColor.name())); commandCompassBarProgressPercent = (float) getDouble("command.compass.percent", commandCompassBarProgressPercent); commandCompassBarTickInterval = getInt("command.compass.tick-interval", commandCompassBarTickInterval); diff --git a/patches/server/0012-Purpur-Lagging-threshold.patch b/patches/server/0012-Purpur-Lagging-threshold.patch index 1112ddeb..b606fc62 100644 --- a/patches/server/0012-Purpur-Lagging-threshold.patch +++ b/patches/server/0012-Purpur-Lagging-threshold.patch @@ -42,10 +42,10 @@ index b4cb8cdacc822d9bf238fcc2029b21c28ea1753b..8e3d8b34816a4c097fa6a001aae6eaa2 + // Purpur end } diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 728edf151d248ed9a36cab42e88d68aa398f0569..0d138136cd0b960c8d4e2f1416fae7c2ad81995d 100644 +index 95131d2fb1b2fff8fe787498ab4d9fbbdf970118..81a06fa14b0c47321ad37ad73b59770f1563c883 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -155,6 +155,11 @@ public class LeafConfig { +@@ -183,6 +183,11 @@ public class LeafConfig { maxUseItemDistance = getDouble("max-UseItem-distance", maxUseItemDistance, "The max distance of UseItem for players"); } diff --git a/patches/server/0013-Purpur-Configurable-TPS-Catchup.patch b/patches/server/0013-Purpur-Configurable-TPS-Catchup.patch index 009ac654..d4a2be28 100644 --- a/patches/server/0013-Purpur-Configurable-TPS-Catchup.patch +++ b/patches/server/0013-Purpur-Configurable-TPS-Catchup.patch @@ -25,10 +25,10 @@ index fe25f51ee708c76bcf66e3280bb235713c99f79c..1f3f414ede558f590a5e68256a60d9ca this.isReady = true; JvmProfiler.INSTANCE.onServerTick(this.averageTickTime); diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 0d138136cd0b960c8d4e2f1416fae7c2ad81995d..3e45e996642d8a7b0d1bbcb21993eb4942c577d2 100644 +index 81a06fa14b0c47321ad37ad73b59770f1563c883..1beacdeacb712396cd3de1206c9789be800d2761 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -156,8 +156,10 @@ public class LeafConfig { +@@ -184,8 +184,10 @@ public class LeafConfig { } public static double laggingThreshold = 19.0D; diff --git a/patches/server/0014-Purpur-Add-allow-water-in-end-world-option.patch b/patches/server/0014-Purpur-Add-allow-water-in-end-world-option.patch index 4052c749..ea8bce5a 100644 --- a/patches/server/0014-Purpur-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0014-Purpur-Add-allow-water-in-end-world-option.patch @@ -70,10 +70,10 @@ index 64206d94a5bf210116d208f9678618b905a61428..fbb06c5db6f80008a54563b7d959e55e } else { world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState()); diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 3e45e996642d8a7b0d1bbcb21993eb4942c577d2..8c9b0cde5640700c5e74d17fe621bf2180384b41 100644 +index 1beacdeacb712396cd3de1206c9789be800d2761..e0f97f0072232fb4aa45e0cebc98860418c63215 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -223,7 +223,9 @@ public class LeafConfig { +@@ -251,7 +251,9 @@ public class LeafConfig { } public static boolean compassItemShowsBossBar = false; diff --git a/patches/server/0015-Purpur-Configurable-sponge-absorption.patch b/patches/server/0015-Purpur-Configurable-sponge-absorption.patch index b0e8e0b1..937b90f5 100644 --- a/patches/server/0015-Purpur-Configurable-sponge-absorption.patch +++ b/patches/server/0015-Purpur-Configurable-sponge-absorption.patch @@ -46,10 +46,10 @@ index 7304b2659eb45bc4bc9fa7c43e6ca07221d0fc73..35a69bb50bc0575dd4f285cc9499d085 } } diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 8c9b0cde5640700c5e74d17fe621bf2180384b41..61852eb1ed63cd809c9079762f2302464fada8c9 100644 +index e0f97f0072232fb4aa45e0cebc98860418c63215..8b17256c03682f54f1c22c59e16ea7d282574626 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -228,4 +228,11 @@ public class LeafConfig { +@@ -256,4 +256,11 @@ public class LeafConfig { compassItemShowsBossBar = getBoolean("gameplay-mechanics.item.compass.holding-shows-bossbar", compassItemShowsBossBar); allowWaterPlacementInTheEnd = getBoolean("gameplay-mechanics.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd); } diff --git a/patches/server/0016-Purpur-Configurable-piston-push-limit.patch b/patches/server/0016-Purpur-Configurable-piston-push-limit.patch index 998a6b9b..14fe20b7 100644 --- a/patches/server/0016-Purpur-Configurable-piston-push-limit.patch +++ b/patches/server/0016-Purpur-Configurable-piston-push-limit.patch @@ -38,10 +38,10 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..460609a50d0f68c191f0fd529a7dc582 } diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 61852eb1ed63cd809c9079762f2302464fada8c9..251f74d66af010ea13e02efa62c6f62d5b74fe2c 100644 +index 8b17256c03682f54f1c22c59e16ea7d282574626..cf40152856e51a3c90d6740f45f0e63d582763ed 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -231,8 +231,10 @@ public class LeafConfig { +@@ -259,8 +259,10 @@ public class LeafConfig { public static int spongeAbsorptionArea = 64; public static int spongeAbsorptionRadius = 6; diff --git a/patches/server/0017-Purpur-Configurable-broadcast-settings.patch b/patches/server/0017-Purpur-Configurable-broadcast-settings.patch index 58e2a29e..b4b6841d 100644 --- a/patches/server/0017-Purpur-Configurable-broadcast-settings.patch +++ b/patches/server/0017-Purpur-Configurable-broadcast-settings.patch @@ -128,10 +128,10 @@ index ce197df36b3746dbd511287ecd78e46eaec3d5e0..b439a6033223269c94e988069c0df3ad public void sendSystemMessage(Component message) {} diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 251f74d66af010ea13e02efa62c6f62d5b74fe2c..d0399e48385e5c69303d3a82b3c221e12d18160d 100644 +index cf40152856e51a3c90d6740f45f0e63d582763ed..e66bb8559d6756e07d4c75a1195927377dc7960d 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -222,6 +222,13 @@ public class LeafConfig { +@@ -250,6 +250,13 @@ public class LeafConfig { commandRamBarTickInterval = getInt("command.rambar.tick-interval", commandRamBarTickInterval); } diff --git a/patches/server/0019-Purpur-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0019-Purpur-Persistent-BlockEntity-Lore-and-DisplayName.patch index 5dcb631b..1cab1b80 100644 --- a/patches/server/0019-Purpur-Persistent-BlockEntity-Lore-and-DisplayName.patch +++ b/patches/server/0019-Purpur-Persistent-BlockEntity-Lore-and-DisplayName.patch @@ -198,10 +198,10 @@ index 58986bc0677c5ea1ad54d7d6d4efa5c2ea233aea..59d616137088af46d4494171fe96ba01 + // Purpur end } diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index d0399e48385e5c69303d3a82b3c221e12d18160d..5743c5c1cb7fa9fc82fb66ca9efbe2b14ef33f4f 100644 +index e66bb8559d6756e07d4c75a1195927377dc7960d..8f6198983afdf371200d266f7b6e005a97598fcd 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -231,9 +231,11 @@ public class LeafConfig { +@@ -259,9 +259,11 @@ public class LeafConfig { public static boolean compassItemShowsBossBar = false; public static boolean allowWaterPlacementInTheEnd = true; diff --git a/patches/server/0022-Purpur-Lobotomize-stuck-villagers.patch b/patches/server/0022-Purpur-Lobotomize-stuck-villagers.patch index f3437a29..5b4f723f 100644 --- a/patches/server/0022-Purpur-Lobotomize-stuck-villagers.patch +++ b/patches/server/0022-Purpur-Lobotomize-stuck-villagers.patch @@ -110,10 +110,10 @@ index a1a8ac55e572156671e47317ba061855be79e5ac..ec3fb8865211bd7625103c37af7b96df + // Purpur end } diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 5743c5c1cb7fa9fc82fb66ca9efbe2b14ef33f4f..63e76e000e1056e5bf8ef2214e9dd8b4121af4e5 100644 +index 8f6198983afdf371200d266f7b6e005a97598fcd..f7948743b75c2cabaee0f259881e366c371454aa 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -157,9 +157,13 @@ public class LeafConfig { +@@ -185,9 +185,13 @@ public class LeafConfig { public static double laggingThreshold = 19.0D; public static boolean tpsCatchup = true; diff --git a/patches/server/0023-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0023-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch index 97f7e376..aea72e95 100644 --- a/patches/server/0023-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0023-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch @@ -20,10 +20,10 @@ index ed8c12a221c493657f8bdf3c1cb91b0dc2384699..1aaf511a1f69eae6a83e3d7d2cf4d3f0 } while (!this.lastChatTimeStamp.compareAndSet(instant1, timestamp)); diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 63e76e000e1056e5bf8ef2214e9dd8b4121af4e5..eba534697ad6a2e68947e97883a15ed8ba96622e 100644 +index f7948743b75c2cabaee0f259881e366c371454aa..e8ca567656f23548ddd2485e2f973ec128d93763 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -250,4 +250,9 @@ public class LeafConfig { +@@ -278,4 +278,9 @@ public class LeafConfig { spongeAbsorptionRadius = getInt("blocks.sponge.absorption.radius", spongeAbsorptionRadius); pistonBlockPushLimit = getInt("blocks.piston.block-push-limit", pistonBlockPushLimit); } diff --git a/patches/server/0027-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch b/patches/server/0027-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch index 9a99fdc5..19c90901 100644 --- a/patches/server/0027-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch +++ b/patches/server/0027-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch @@ -28,10 +28,10 @@ index 7b0374b6e22105e59b29995983a6ac50268c722e..da45ccd3b96158dace1dec4c291aa98f } 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 eba534697ad6a2e68947e97883a15ed8ba96622e..7fc53776dbe0c57b2639a52f117f33a7cc2f5471 100644 +index e8ca567656f23548ddd2485e2f973ec128d93763..b3604afdc3fcb515d0c56349552dc1eaeb733a5a 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -159,11 +159,13 @@ public class LeafConfig { +@@ -187,11 +187,13 @@ public class LeafConfig { public static boolean tpsCatchup = true; public static boolean villagerLobotomizeEnabled = false; public static int villagerLobotomizeCheckInterval = 100; diff --git a/patches/server/0030-Carpet-Fixes-Optimize-Math.round-and-Math.hypot-func.patch b/patches/server/0030-Carpet-Fixes-Optimize-Math.round-and-Math.hypot-func.patch index 3654150d..d8180cb2 100644 --- a/patches/server/0030-Carpet-Fixes-Optimize-Math.round-and-Math.hypot-func.patch +++ b/patches/server/0030-Carpet-Fixes-Optimize-Math.round-and-Math.hypot-func.patch @@ -487,10 +487,10 @@ index 731c7dd15f131dc124be6af8f342b122cb89491b..24a82111a5485da1e3903977d0519e9e return i; } diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index 7fc53776dbe0c57b2639a52f117f33a7cc2f5471..bec3455fda7da93af1991ce9fd946acfebd0e47e 100644 +index b3604afdc3fcb515d0c56349552dc1eaeb733a5a..4260147ebc4f1e60ce510212c2829ed32f94b735 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -160,12 +160,18 @@ public class LeafConfig { +@@ -188,12 +188,18 @@ public class LeafConfig { public static boolean villagerLobotomizeEnabled = false; public static int villagerLobotomizeCheckInterval = 100; public static boolean useSpigotItemMergingMechanism = true; diff --git a/patches/server/0035-Pufferfish-Sentry.patch b/patches/server/0035-Pufferfish-Sentry.patch index d52341f0..e0fe3564 100644 --- a/patches/server/0035-Pufferfish-Sentry.patch +++ b/patches/server/0035-Pufferfish-Sentry.patch @@ -194,10 +194,10 @@ index 0000000000000000000000000000000000000000..bcacccd9d47697bea0405f2544be94fc + +} diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java -index bec3455fda7da93af1991ce9fd946acfebd0e47e..2513100442d342000908a47ad4b6d75d4fb62680 100644 +index 4260147ebc4f1e60ce510212c2829ed32f94b735..ecc9535595d0e8a5777f45d276b970318db80265 100644 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java -@@ -162,6 +162,7 @@ public class LeafConfig { +@@ -190,6 +190,7 @@ public class LeafConfig { public static boolean useSpigotItemMergingMechanism = true; public static boolean optimizedRound = true; public static boolean optimizedHypot = true; @@ -205,7 +205,7 @@ index bec3455fda7da93af1991ce9fd946acfebd0e47e..2513100442d342000908a47ad4b6d75d private static void performance() { laggingThreshold = getDouble("performance.lagging-threshold", laggingThreshold); tpsCatchup = getBoolean("performance.tps-catchup", tpsCatchup); -@@ -172,6 +173,12 @@ public class LeafConfig { +@@ -200,6 +201,12 @@ public class LeafConfig { "Whether or not Math.round should be replaced by a faster version."); optimizedHypot = getBoolean("performance.optimize-math-hypot", optimizedHypot, "Whether or not Math.hypot should be replaced by a faster version.");