Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -0,0 +1,27 @@
--- a/net/minecraft/server/DedicatedServerSettings.java
+++ b/net/minecraft/server/DedicatedServerSettings.java
@@ -1,15 +1,21 @@
package net.minecraft.server;
import java.util.function.UnaryOperator;
+// CraftBukkit start
+import java.io.File;
+import joptsimple.OptionSet;
+// CraftBukkit end
public class DedicatedServerSettings {
private final java.nio.file.Path path;
private DedicatedServerProperties properties;
- public DedicatedServerSettings(java.nio.file.Path java_nio_file_path) {
- this.path = java_nio_file_path;
- this.properties = DedicatedServerProperties.load(java_nio_file_path);
+ // CraftBukkit start
+ public DedicatedServerSettings(OptionSet optionset) {
+ this.path = ((File) optionset.valueOf("config")).toPath();
+ this.properties = DedicatedServerProperties.load(path, optionset);
+ // CraftBukkit end
}
public DedicatedServerProperties getProperties() {