From 29f6c16bcd03874bcea390fa97c6e47b9d30236b Mon Sep 17 00:00:00 2001 From: flewkey Date: Sat, 1 Jun 2019 19:59:43 -0700 Subject: [PATCH] Forgot to remove this --- patches/net/minecraft/server/MinecraftServer.patch | 2 +- src/party/_2a03/server/Config.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/patches/net/minecraft/server/MinecraftServer.patch b/patches/net/minecraft/server/MinecraftServer.patch index 00923f8..51a815f 100644 --- a/patches/net/minecraft/server/MinecraftServer.patch +++ b/patches/net/minecraft/server/MinecraftServer.patch @@ -30,7 +30,7 @@ dedicatedserver.func_213208_c(optionset.valueOf(optionspec11)); boolean flag = !optionset.has(optionspec) && !optionset.valuesOf(optionspec12).contains("nogui"); - if (flag && !GraphicsEnvironment.isHeadless()) { -+ Config.initConfig(field_71305_c); //Patched ++ Config.initConfig(field_71305_c); //Patched + Config.loadConfig(); //Patched + if (flag && !GraphicsEnvironment.isHeadless() && false) { //Patched dedicatedserver.func_120011_ar(); diff --git a/src/party/_2a03/server/Config.java b/src/party/_2a03/server/Config.java index c271182..91f52d0 100644 --- a/src/party/_2a03/server/Config.java +++ b/src/party/_2a03/server/Config.java @@ -6,7 +6,6 @@ import java.io.FileWriter; import java.io.FileInputStream; import java.io.InputStream; import java.util.Map; -import net.minecraft.server.MinecraftServer; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.ServerWorld; import org.json.JSONObject; @@ -21,7 +20,6 @@ public class Config { private static JSONObject json; private static final Logger logger = LogManager.getLogger(); private static Map worlds = Maps.newIdentityHashMap(); - public static MinecraftServer server; public static void initConfig(Map p_worlds) { worlds = p_worlds;