diff options
Diffstat (limited to 'nms-patches/DedicatedServer.patch')
| -rw-r--r-- | nms-patches/DedicatedServer.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch index f84e8961..7edf9e18 100644 --- a/nms-patches/DedicatedServer.patch +++ b/nms-patches/DedicatedServer.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/DedicatedServer.java 2015-02-26 22:40:22.443608141 +0000 -+++ src/main/java/net/minecraft/server/DedicatedServer.java 2015-02-26 22:40:22.443608141 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/DedicatedServer.java 2015-05-05 21:41:20.360643410 +0100 ++++ src/main/java/net/minecraft/server/DedicatedServer.java 2015-05-05 21:41:20.364643350 +0100 @@ -15,20 +15,32 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -94,7 +94,7 @@ + System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); + // CraftBukkit end + - DedicatedServer.LOGGER.info("Starting minecraft server version 1.8.3"); + DedicatedServer.LOGGER.info("Starting minecraft server version 1.8.4"); if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { DedicatedServer.LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); } @@ -122,7 +122,7 @@ + this.convertable = new WorldLoaderServer(server.getWorldContainer()); // CraftBukkit - moved from MinecraftServer constructor long j = System.nanoTime(); - if (this.T() == null) { + if (this.U() == null) { @@ -198,8 +248,19 @@ DedicatedServer.LOGGER.info("Starting remote control listener"); this.n = new RemoteControlListener(this); @@ -140,7 +140,7 @@ + } + // CraftBukkit end + - if (this.aR() > 0L) { + if (this.aS() > 0L) { Thread thread1 = new Thread(new ThreadWatchdog(this)); @@ -213,6 +274,12 @@ @@ -160,10 +160,10 @@ System.exit(0); } -- protected void A() { -+ public void A() { // CraftBukkit - fix decompile error - super.A(); - this.aN(); +- protected void B() { ++ public void B() { // CraftBukkit - fix decompile error + super.B(); + this.aO(); } @@ -296,7 +363,14 @@ while (!this.l.isEmpty()) { @@ -181,7 +181,7 @@ } } -@@ -487,13 +561,57 @@ +@@ -491,13 +565,57 @@ } public String getPlugins() { |