1
0
This repository has been archived on 2020-06-15. You can view files and clone it, but cannot push or open issues or pull requests.
mc.2a03.party/patches/net/minecraft/server/MinecraftServer.patch
flewkey ff60795d2b
1.15
Signed-off-by: flewkey <flewkey@2a03.party>
2020-06-15 23:08:01 +00:00

48 lines
2.1 KiB
Diff

--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -135,6 +135,7 @@
import org.apache.commons.lang3.Validate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import party._2a03.mc.server.Config; //Patched
public abstract class MinecraftServer extends RecursiveEventLoop<TickDelayedTask> implements ISnooperInfo, ICommandSource, AutoCloseable, Runnable {
private static final Logger field_147145_h = LogManager.getLogger();
@@ -153,7 +154,7 @@
private final DataFixer field_184112_s;
private String field_71320_r;
private int field_71319_s = -1;
- private final Map<DimensionType, ServerWorld> field_71305_c = Maps.newIdentityHashMap();
+ private static final Map<DimensionType, ServerWorld> field_71305_c = Maps.newIdentityHashMap(); //Patched
private PlayerList field_71318_t;
private volatile boolean field_71317_u = true;
private boolean field_71316_v;
@@ -832,6 +833,7 @@
}
public static void main(String[] p_main_0_) {
+ field_147145_h.info("This jar has been patched!"); //Patched
OptionParser optionparser = new OptionParser();
OptionSpec<Void> optionspec = optionparser.accepts("nogui");
OptionSpec<Void> optionspec1 = optionparser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits");
@@ -886,7 +888,9 @@
dedicatedserver.func_213197_c(optionset.has(optionspec5));
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.loadConfig(); //Patched
+ if (flag && !GraphicsEnvironment.isHeadless() && false) { //Patched
dedicatedserver.func_120011_ar();
}
@@ -972,7 +976,7 @@
}
public String getServerModName() {
- return "vanilla";
+ return "mc.2a03.party"; //Patched
}
public CrashReport func_71230_b(CrashReport p_71230_1_) {