mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +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
52 lines
2.9 KiB
Diff
52 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
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 00a1707209..5eb9b3d35e 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<WorldGenFeatureEndSpikeConfigu
|
|
}
|
|
|
|
public static List<WorldGenEnder.Spike> 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, ChunkGenerator chunkgenerator, Random random, BlockPosition blockposition, WorldGenFeatureEndSpikeConfiguration worldgenfeatureendspikeconfiguration) { return a(generatoraccessseed, chunkgenerator, random, blockposition, worldgenfeatureendspikeconfiguration); } // Purpur - decompile error?
|
|
public boolean a(GeneratorAccessSeed generatoraccessseed, ChunkGenerator chunkgenerator, Random random, BlockPosition blockposition, WorldGenFeatureEndSpikeConfiguration worldgenfeatureendspikeconfiguration) {
|
|
List<WorldGenEnder.Spike> list = worldgenfeatureendspikeconfiguration.c();
|
|
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index cb7ea33361..ac023770ea 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -1,5 +1,6 @@
|
|
package net.pl3x.purpur;
|
|
|
|
+import co.aikar.timings.TimingsManager;
|
|
import com.google.common.base.Throwables;
|
|
import net.minecraft.server.MinecraftServer;
|
|
import net.pl3x.purpur.command.PurpurCommand;
|
|
@@ -140,6 +141,13 @@ public class PurpurConfig {
|
|
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
|
|
}
|
|
|
|
+ public static int endSpikeSeed = -1;
|
|
+ private static void seedSettings() {
|
|
+ endSpikeSeed = getInt("settings.seed.end-spike", endSpikeSeed);
|
|
+ if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed");
|
|
+ if (!TimingsManager.hiddenConfigs.contains("settings.seed.end-spike")) TimingsManager.hiddenConfigs.add("settings.seed.end-spike");
|
|
+ }
|
|
+
|
|
public static String serverModName = "Purpur";
|
|
private static void serverModName() {
|
|
serverModName = getString("settings.server-mod-name", serverModName);
|