From 2b52d7fe85f964eb71ebf773aebb11480fd35412 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 15 Jul 2020 11:59:09 -0500 Subject: [PATCH] Configurable end spike seed --- .../0111-Configurable-end-spike-seed.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 patches/server/0111-Configurable-end-spike-seed.patch diff --git a/patches/server/0111-Configurable-end-spike-seed.patch b/patches/server/0111-Configurable-end-spike-seed.patch new file mode 100644 index 000000000..34f1cf295 --- /dev/null +++ b/patches/server/0111-Configurable-end-spike-seed.patch @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Wed, 15 Jul 2020 11:49:36 -0500 +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 +--- 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 a(GeneratorAccessSeed generatoraccessseed) { +- Random random = new Random(generatoraccessseed.getSeed()); ++ int seed = net.pl3x.purpur.PurpurConfig.endSpikeSeed; // Purpur ++ Random random = new Random(seed == -1 ? generatoraccessseed.getSeed() : seed); // Purpur + long i = random.nextLong() & 65535L; + + return (List) WorldGenEnder.a.getUnchecked(i); + } + ++ public boolean generate(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, ChunkGenerator chunkgenerator, Random random, BlockPosition blockposition, WorldGenFeatureEndSpikeConfiguration worldgenfeatureendspikeconfiguration) { return a(generatoraccessseed, structuremanager, chunkgenerator, random, blockposition, worldgenfeatureendspikeconfiguration); } // Purpur - decompile error? + public boolean a(GeneratorAccessSeed generatoraccessseed, StructureManager structuremanager, ChunkGenerator chunkgenerator, Random random, BlockPosition blockposition, WorldGenFeatureEndSpikeConfiguration worldgenfeatureendspikeconfiguration) { + 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..a4fd1dff61 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); + 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() {