From 65597df2f67e51d9c1fab615070232dca77fc909 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 15 Jul 2020 13:19:49 -0500 Subject: [PATCH] Fix dungeons using end spike seed --- .../server/0111-Configurable-end-spike-seed.patch | 12 ++++++------ patches/server/0112-Configurable-dungeon-seed.patch | 12 +++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/patches/server/0111-Configurable-end-spike-seed.patch b/patches/server/0111-Configurable-end-spike-seed.patch index 34f1cf295..5d02dce8a 100644 --- a/patches/server/0111-Configurable-end-spike-seed.patch +++ b/patches/server/0111-Configurable-end-spike-seed.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end spike seed diff --git a/src/main/java/net/minecraft/server/WorldGenEnder.java b/src/main/java/net/minecraft/server/WorldGenEnder.java -index 495d98e154..9df359d0ba 100644 +index 495d98e15..9df359d0b 100644 --- a/src/main/java/net/minecraft/server/WorldGenEnder.java +++ b/src/main/java/net/minecraft/server/WorldGenEnder.java @@ -23,12 +23,14 @@ public class WorldGenEnder extends WorldGenerator 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..a4fd1dff61 100644 +index 2abbc6b17..f9b382dcc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -141,6 +141,11 @@ public class PurpurConfig { - pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput); +@@ -142,6 +142,11 @@ public class PurpurConfig { cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob); } -+ + + public static int endSpikeSeed = -1; + private static void seedSettings() { + endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed); + } - ++ public static String serverModName = "Purpur"; private static void serverModName() { + serverModName = getString("settings.server-mod-name", serverModName); diff --git a/patches/server/0112-Configurable-dungeon-seed.patch b/patches/server/0112-Configurable-dungeon-seed.patch index 7fa40d5a4..74cb8d9ca 100644 --- a/patches/server/0112-Configurable-dungeon-seed.patch +++ b/patches/server/0112-Configurable-dungeon-seed.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Configurable dungeon seed diff --git a/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java b/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java -index 70d2229960..cfdb2bf4da 100644 +index 70d222996..73a2f2969 100644 --- a/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java +++ b/src/main/java/net/minecraft/server/WorldGenDecoratorDungeon.java @@ -14,10 +14,12 @@ public class WorldGenDecoratorDungeon extends WorldGenDecorator a(GeneratorAccess generatoraccess, ChunkGenerator chunkgenerator, Random random, WorldGenDecoratorDungeonConfiguration worldgendecoratordungeonconfiguration, BlockPosition blockposition) { int i = worldgendecoratordungeonconfiguration.b; -+ int seed = net.pl3x.purpur.PurpurConfig.endSpikeSeed; // Purpur ++ int seed = net.pl3x.purpur.PurpurConfig.dungeonSeed; // Purpur + final Random rand = seed == -1 ? random : new Random(seed); // Purpur return IntStream.range(0, i).mapToObj((j) -> { - int k = random.nextInt(16) + blockposition.getX(); @@ -25,15 +25,13 @@ index 70d2229960..cfdb2bf4da 100644 return new BlockPosition(k, i1, l); }); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index a4fd1dff61..cd524cabcd 100644 +index f9b382dcc..cd524cabc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -141,9 +141,11 @@ public class PurpurConfig { - pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput); +@@ -142,8 +142,10 @@ public class PurpurConfig { cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob); } -- -+ + + public static int dungeonSeed = -1; public static int endSpikeSeed = -1; private static void seedSettings() {