mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
cea486c6a7
Upstream has released updates that appear to apply and compile correctly Paper Changes: 9a129fa99 Add #getEligibleHumans to SkeletonHorseTrapEvent b5e23c7a6 Fix merging spawning values a932e8ad7 Turn off spigot verbose world by default 8ced89f65 Fix Delegation to vanilla chunk gen
51 lines
3.0 KiB
Diff
51 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
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<WorldGenFeatureEmptyConfigu
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
|
private static final EntityTypes<?>[] 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<WorldGenFeatureEmptyConfiguration> 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 ac023770ea..a26ef47c46 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");
|
|
}
|
|
|