diff --git a/patches/server/0108-Configurable-end-spike-seed.patch b/patches/server/0108-Configurable-end-spike-seed.patch index 735ab877d..72378e334 100644 --- a/patches/server/0108-Configurable-end-spike-seed.patch +++ b/patches/server/0108-Configurable-end-spike-seed.patch @@ -25,7 +25,7 @@ index 495d98e154..9df359d0ba 100644 List list = worldgenfeatureendspikeconfiguration.b(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 2abbc6b177..4c68d65f69 100644 +index 2abbc6b177..e296f935ab 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,5 +1,6 @@ @@ -42,8 +42,8 @@ index 2abbc6b177..4c68d65f69 100644 + public static int endSpikeSeed = -1; + private static void seedSettings() { + endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed); -+ TimingsManager.hiddenConfigs.add("settings.seed"); -+ TimingsManager.hiddenConfigs.add("settings.seed.end-spike"); ++ if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed"); ++ if (!TimingsManager.hiddenConfigs.contains("settings.seed.end-spike")) TimingsManager.hiddenConfigs.add("settings.seed.end-spike"); + } + public static String serverModName = "Purpur"; diff --git a/patches/server/0109-Configurable-dungeon-seed.patch b/patches/server/0109-Configurable-dungeon-seed.patch index 7c4c64505..67dd7ad52 100644 --- a/patches/server/0109-Configurable-dungeon-seed.patch +++ b/patches/server/0109-Configurable-dungeon-seed.patch @@ -64,7 +64,7 @@ index 3c7c936453..1f6ff78488 100644 int i = random.nextInt(2) + 2; int j = -i - 1; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 4c68d65f69..2e75ad1a75 100644 +index e296f935ab..59b6414b2f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -143,10 +143,13 @@ public class PurpurConfig { @@ -76,8 +76,8 @@ index 4c68d65f69..2e75ad1a75 100644 private static void seedSettings() { + dungeonSeed = getInt("settings.seed.dungeon", dungeonSeed); endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed); - TimingsManager.hiddenConfigs.add("settings.seed"); -+ TimingsManager.hiddenConfigs.add("settings.seed.dungeon"); - TimingsManager.hiddenConfigs.add("settings.seed.end-spike"); + if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed"); ++ if (!TimingsManager.hiddenConfigs.contains("settings.seed.dungeon")) TimingsManager.hiddenConfigs.add("settings.seed.dungeon"); + if (!TimingsManager.hiddenConfigs.contains("settings.seed.end-spike")) TimingsManager.hiddenConfigs.add("settings.seed.end-spike"); } diff --git a/patches/server/0116-Populator-seed-controls.patch b/patches/server/0116-Populator-seed-controls.patch index 83adf86e9..e9df6c93b 100644 --- a/patches/server/0116-Populator-seed-controls.patch +++ b/patches/server/0116-Populator-seed-controls.patch @@ -4,8 +4,21 @@ Date: Sat, 18 Jul 2020 11:27:43 -0500 Subject: [PATCH] Populator seed controls +diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java +index dae2e5d707..55b67f1057 100644 +--- a/src/main/java/co/aikar/timings/TimingsExport.java ++++ b/src/main/java/co/aikar/timings/TimingsExport.java +@@ -293,7 +293,7 @@ public class TimingsExport extends Thread { + JSONObject object = new JSONObject(); + for (String key : config.getKeys(false)) { + String fullKey = (parentKey != null ? parentKey + "." + key : key); +- if (fullKey.equals("database") || fullKey.equals("settings.bungeecord-addresses") || TimingsManager.hiddenConfigs.contains(fullKey) || key.startsWith("seed-") || key.equals("worldeditregentempworld")) { ++ if (fullKey.equals("database") || fullKey.equals("settings.bungeecord-addresses") || TimingsManager.hiddenConfigs.contains(fullKey) || key.startsWith("seed-") || key.equals("worldeditregentempworld") || fullKey.contains("worldgen.seeds.populator")) { // Tuinity + continue; + } + final Object val = config.get(key); diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java -index 1c7b858ed5..199221c0d8 100644 +index 1c7b858ed5..338ecd2d75 100644 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java @@ -1,5 +1,6 @@ @@ -41,7 +54,7 @@ index 1c7b858ed5..199221c0d8 100644 + } else if (!seedString.equalsIgnoreCase("default")) { + this.populatorSeed = Long.parseLong(seedString); + } -+ TimingsManager.hiddenConfigs.add("worldgen.seeds.populator"); ++ if (!TimingsManager.hiddenConfigs.contains("worldgen.seeds.populator")) TimingsManager.hiddenConfigs.add("worldgen.seeds.populator"); + } + }