mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-09 19:49:35 +01:00
71 lines
3.2 KiB
Diff
71 lines
3.2 KiB
Diff
--- a/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
+++ b/net/minecraft/server/dedicated/DedicatedServerProperties.java
|
|
@@ -13,8 +13,14 @@
|
|
import net.minecraft.world.level.EnumGamemode;
|
|
import net.minecraft.world.level.levelgen.GeneratorSettings;
|
|
|
|
+// CraftBukkit start
|
|
+import joptsimple.OptionSet;
|
|
+import net.minecraft.server.dedicated.PropertyManager.EditableProperty;
|
|
+// CraftBukkit end
|
|
+
|
|
public class DedicatedServerProperties extends PropertyManager<DedicatedServerProperties> {
|
|
|
|
+ public final boolean debug = this.get("debug", false); // CraftBukkit
|
|
public final boolean onlineMode = this.get("online-mode", true);
|
|
public final boolean preventProxyConnections = this.get("prevent-proxy-connections", false);
|
|
public final String serverIp = this.get("server-ip", "");
|
|
@@ -71,8 +77,10 @@
|
|
@Nullable
|
|
private GeneratorSettings worldGenSettings;
|
|
|
|
- public DedicatedServerProperties(Properties properties) {
|
|
- super(properties);
|
|
+ // CraftBukkit start
|
|
+ public DedicatedServerProperties(Properties properties, OptionSet optionset) {
|
|
+ super(properties, optionset);
|
|
+ // CraftBukkit end
|
|
this.difficulty = (EnumDifficulty) this.get("difficulty", dispatchNumberOrString(EnumDifficulty::byId, EnumDifficulty::byName), EnumDifficulty::getKey, EnumDifficulty.EASY);
|
|
this.gamemode = (EnumGamemode) this.get("gamemode", dispatchNumberOrString(EnumGamemode::byId, EnumGamemode::byName), EnumGamemode::getName, EnumGamemode.SURVIVAL);
|
|
this.levelName = this.get("level-name", "world");
|
|
@@ -121,13 +129,15 @@
|
|
}, "default"));
|
|
}
|
|
|
|
- public static DedicatedServerProperties fromFile(Path path) {
|
|
- return new DedicatedServerProperties(loadFromFile(path));
|
|
+ // CraftBukkit start
|
|
+ public static DedicatedServerProperties fromFile(Path path, OptionSet optionset) {
|
|
+ return new DedicatedServerProperties(loadFromFile(path), optionset);
|
|
}
|
|
|
|
@Override
|
|
- protected DedicatedServerProperties reload(IRegistryCustom iregistrycustom, Properties properties) {
|
|
- DedicatedServerProperties dedicatedserverproperties = new DedicatedServerProperties(properties);
|
|
+ protected DedicatedServerProperties reload(IRegistryCustom iregistrycustom, Properties properties, OptionSet optionset) {
|
|
+ DedicatedServerProperties dedicatedserverproperties = new DedicatedServerProperties(properties, optionset);
|
|
+ // CraftBukkit end
|
|
|
|
dedicatedserverproperties.getWorldGenSettings(iregistrycustom);
|
|
return dedicatedserverproperties;
|
|
@@ -141,8 +151,10 @@
|
|
return this.worldGenSettings;
|
|
}
|
|
|
|
- public static record a(String a, JsonObject b, boolean c, String d) {
|
|
+ // CraftBukkit start - decompile error
|
|
+ public static record a(String levelSeed, JsonObject generatorSettings, boolean generateStructures, String levelType) {
|
|
|
|
+ /*
|
|
private final String levelSeed;
|
|
private final JsonObject generatorSettings;
|
|
private final boolean generateStructures;
|
|
@@ -154,6 +166,8 @@
|
|
this.generateStructures = flag;
|
|
this.levelType = s1;
|
|
}
|
|
+ */
|
|
+ // CraftBukkit end
|
|
|
|
public String levelSeed() {
|
|
return this.levelSeed;
|