Fix dungeons using end spike seed

This commit is contained in:
William Blake Galbreath
2020-07-15 13:19:49 -05:00
parent df0b28940e
commit 65597df2f6
2 changed files with 11 additions and 13 deletions

View File

@@ -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<WorldGenDecorato
public Stream<BlockPosition> 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() {