2019-04-23 05:36:14 +08:00
|
|
|
From 264373f74330d046b10469dbe24d45a0c3971da5 Mon Sep 17 00:00:00 2001
|
2018-09-18 11:38:17 +08:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Mon, 17 Sep 2018 23:05:31 -0400
|
|
|
|
Subject: [PATCH] Support Overriding World Seeds
|
|
|
|
|
|
|
|
Allows you to add to paper.yml
|
|
|
|
|
|
|
|
seed-overrides:
|
|
|
|
world_name: some seed value
|
|
|
|
|
|
|
|
This will ignore every where a seed is set/created/loaded and force
|
|
|
|
a world to use the specified seed.
|
|
|
|
|
|
|
|
This seed will end up being saved to the world data file, so it is
|
|
|
|
a permanent change in that it won't go back if you remove it from paper.yml
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
2019-04-23 05:36:14 +08:00
|
|
|
index 2023b5af0f..07d7976d21 100644
|
2018-09-18 11:38:17 +08:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
|
|
@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
|
|
|
|
import java.util.HashMap;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
+import java.util.Set;
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
import java.util.logging.Level;
|
|
|
|
import java.util.logging.Logger;
|
|
|
|
@@ -20,6 +21,7 @@ import com.google.common.collect.Lists;
|
|
|
|
import net.minecraft.server.MinecraftServer;
|
|
|
|
import org.bukkit.Bukkit;
|
|
|
|
import org.bukkit.command.Command;
|
|
|
|
+import org.bukkit.configuration.ConfigurationSection;
|
|
|
|
import org.bukkit.configuration.InvalidConfigurationException;
|
|
|
|
import org.bukkit.configuration.file.YamlConfiguration;
|
|
|
|
import co.aikar.timings.Timings;
|
2018-12-15 09:17:27 +08:00
|
|
|
@@ -355,4 +357,23 @@ public class PaperConfig {
|
2018-09-18 11:38:17 +08:00
|
|
|
}
|
|
|
|
tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public static Map<String, Long> seedOverride = new java.util.HashMap<>();
|
|
|
|
+ private static void worldSeedOverrides() {
|
|
|
|
+ ConfigurationSection seeds = config.getConfigurationSection("seed-overrides");
|
|
|
|
+ if (seeds != null) {
|
|
|
|
+ TimingsManager.hiddenConfigs.add("seed-overrides");
|
|
|
|
+ for (String key : seeds.getKeys(false)) {
|
|
|
|
+ String seedString = seeds.getString(key);
|
|
|
|
+ long seed;
|
|
|
|
+ try {
|
|
|
|
+ seed = Long.parseLong(seedString);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ seed = (long) seedString.hashCode();
|
|
|
|
+ }
|
|
|
|
+ log("Seed Override: " + key + " => " + seed);
|
|
|
|
+ seedOverride.put(key, seed);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2019-04-23 05:36:14 +08:00
|
|
|
index ae271a57fc..4543ac8f15 100644
|
2018-09-18 11:38:17 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2019-01-01 11:15:55 +08:00
|
|
|
@@ -345,7 +345,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
2018-09-18 11:38:17 +08:00
|
|
|
this.convertWorld(name); // Run conversion now
|
|
|
|
|
|
|
|
org.bukkit.generator.ChunkGenerator gen = this.server.getGenerator(name);
|
|
|
|
- WorldSettings worldsettings = new WorldSettings(i, this.getGamemode(), this.getGenerateStructures(), this.isHardcore(), worldtype);
|
|
|
|
+ WorldSettings worldsettings = new WorldSettings(com.destroystokyo.paper.PaperConfig.seedOverride.getOrDefault(name, i), this.getGamemode(), this.getGenerateStructures(), this.isHardcore(), worldtype); // Paper
|
|
|
|
worldsettings.setGeneratorSettings(jsonelement);
|
|
|
|
|
|
|
|
if (j == 0) {
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
|
2019-04-23 05:36:14 +08:00
|
|
|
index 8458dc17d4..b5fb95293e 100644
|
2018-09-18 11:38:17 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldData.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldData.java
|
|
|
|
@@ -110,7 +110,7 @@ public class WorldData {
|
|
|
|
this.d = nbttagcompound2.getBoolean("Snapshot");
|
|
|
|
}
|
|
|
|
|
|
|
|
- this.e = nbttagcompound.getLong("RandomSeed");
|
|
|
|
+ this.e = com.destroystokyo.paper.PaperConfig.seedOverride.getOrDefault(nbttagcompound.getString("LevelName"), nbttagcompound.getLong("RandomSeed")); // Paper
|
|
|
|
if (nbttagcompound.hasKeyOfType("generatorName", 8)) {
|
|
|
|
String s = nbttagcompound.getString("generatorName");
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2019-04-23 05:36:14 +08:00
|
|
|
index d5ab1d11a2..3cf3037857 100644
|
2018-09-18 11:38:17 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2019-04-08 18:51:36 +08:00
|
|
|
@@ -990,7 +990,7 @@ public final class CraftServer implements Server {
|
2018-09-18 11:38:17 +08:00
|
|
|
WorldData worlddata = sdm.getWorldData();
|
|
|
|
WorldSettings worldSettings = null;
|
|
|
|
if (worlddata == null) {
|
|
|
|
- worldSettings = new WorldSettings(creator.seed(), EnumGamemode.getById(getDefaultGameMode().getValue()), generateStructures, hardcore, type);
|
|
|
|
+ worldSettings = new WorldSettings(com.destroystokyo.paper.PaperConfig.seedOverride.getOrDefault(name, creator.seed()), EnumGamemode.getById(getDefaultGameMode().getValue()), generateStructures, hardcore, type); // Paper
|
|
|
|
JsonElement parsedSettings = new JsonParser().parse(creator.generatorSettings());
|
|
|
|
if (parsedSettings.isJsonObject()) {
|
|
|
|
worldSettings.setGeneratorSettings(parsedSettings.getAsJsonObject());
|
|
|
|
--
|
2019-03-20 08:28:15 +08:00
|
|
|
2.21.0
|
2018-09-18 11:38:17 +08:00
|
|
|
|