From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 15 Jul 2020 12:40:25 -0500 Subject: [PATCH] Configurable dungeon seed diff --git a/src/main/java/net/minecraft/server/WorldGenDungeons.java b/src/main/java/net/minecraft/server/WorldGenDungeons.java index 07f7b69fef..6aa1626f38 100644 --- a/src/main/java/net/minecraft/server/WorldGenDungeons.java +++ b/src/main/java/net/minecraft/server/WorldGenDungeons.java @@ -11,12 +11,21 @@ public class WorldGenDungeons extends WorldGenerator[] ab = new EntityTypes[]{EntityTypes.SKELETON, EntityTypes.ZOMBIE, EntityTypes.ZOMBIE, EntityTypes.SPIDER}; private static final IBlockData ac = Blocks.CAVE_AIR.getBlockData(); + private Random random; // Purpur public WorldGenDungeons(Codec codec) { super(codec); } + public boolean generate(GeneratorAccessSeed generatoraccessseed, ChunkGenerator chunkgenerator, Random random, BlockPosition blockposition, WorldGenFeatureEmptyConfiguration worldgenfeatureemptyconfiguration) { return a(generatoraccessseed, chunkgenerator, random, blockposition, worldgenfeatureemptyconfiguration); } // Purpur - decompile error? public boolean a(GeneratorAccessSeed generatoraccessseed, ChunkGenerator chunkgenerator, Random random, BlockPosition blockposition, WorldGenFeatureEmptyConfiguration worldgenfeatureemptyconfiguration) { + // Purpur start + if (this.random == null) { + int seed = net.pl3x.purpur.PurpurConfig.dungeonSeed; + this.random = seed == -1 ? random : new Random(seed); + } + random = this.random; + // Purpur end boolean flag = true; 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 0a4ef782c8..5dbf72cf56 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -141,10 +141,13 @@ public class PurpurConfig { pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput); } + public static int dungeonSeed = -1; public static int endSpikeSeed = -1; private static void seedSettings() { + dungeonSeed = getInt("settings.seed.dungeon", dungeonSeed); endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed); 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"); }