From 19989dfb7d45e49f73acc4be9b0d809a4a95b719 Mon Sep 17 00:00:00 2001 From: Aikar 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 index 214b577b32..559e6b42ba 100644 --- 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.regex.Pattern; @@ -19,6 +20,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; @@ -310,4 +312,23 @@ public class PaperConfig { } tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit); } + + public static Map 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 index dd2d8712ed..7fd0404093 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -377,7 +377,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant