summaryrefslogtreecommitdiffstats
path: root/nms-patches/DedicatedServer.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
committermd_5 <git@md-5.net>2016-05-10 21:47:39 +1000
commitc5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch)
tree9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/DedicatedServer.patch
parent4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff)
downloadcraftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz
craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/DedicatedServer.patch')
-rw-r--r--nms-patches/DedicatedServer.patch24
1 files changed, 12 insertions, 12 deletions
diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch
index 51e175d8..47e205cc 100644
--- a/nms-patches/DedicatedServer.patch
+++ b/nms-patches/DedicatedServer.patch
@@ -12,7 +12,7 @@
import java.net.InetAddress;
import java.net.Proxy;
import java.util.Collections;
-@@ -18,10 +17,20 @@
+@@ -17,10 +16,20 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -34,7 +34,7 @@
private RemoteStatusListener m;
public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this);
private RemoteControlListener o;
-@@ -31,8 +40,10 @@
+@@ -30,8 +39,10 @@
private WorldSettings.EnumGamemode s;
private boolean t;
@@ -47,7 +47,7 @@
Thread thread = new Thread("Server Infinisleeper") {
{
this.setDaemon(true);
-@@ -54,13 +65,27 @@
+@@ -53,13 +64,27 @@
protected boolean init() throws IOException {
Thread thread = new Thread("Server console handler") {
public void run() {
@@ -78,7 +78,7 @@
}
} catch (IOException ioexception) {
DedicatedServer.LOGGER.error("Exception handling console input", ioexception);
-@@ -69,6 +94,27 @@
+@@ -68,6 +93,27 @@
}
};
@@ -105,8 +105,8 @@
+
thread.setDaemon(true);
thread.start();
- DedicatedServer.LOGGER.info("Starting minecraft server version 1.9.2");
-@@ -77,7 +123,7 @@
+ DedicatedServer.LOGGER.info("Starting minecraft server version 1.9.4");
+@@ -76,7 +122,7 @@
}
DedicatedServer.LOGGER.info("Loading properties");
@@ -115,7 +115,7 @@
this.q = new EULA(new File("eula.txt"));
if (!this.q.a()) {
DedicatedServer.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
-@@ -133,6 +179,8 @@
+@@ -132,6 +178,8 @@
return false;
}
@@ -124,7 +124,7 @@
if (!this.getOnlineMode()) {
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
-@@ -147,7 +195,7 @@
+@@ -146,7 +194,7 @@
if (!NameReferencingFileConverter.a(this.propertyManager)) {
return false;
} else {
@@ -133,7 +133,7 @@
long j = System.nanoTime();
if (this.S() == null) {
-@@ -205,7 +253,18 @@
+@@ -204,7 +252,18 @@
DedicatedServer.LOGGER.info("Starting remote control listener");
this.o = new RemoteControlListener(this);
this.o.a();
@@ -152,7 +152,7 @@
if (this.aP() > 0L) {
Thread thread1 = new Thread(new ThreadWatchdog(this));
-@@ -298,7 +357,7 @@
+@@ -297,7 +356,7 @@
System.exit(0);
}
@@ -161,7 +161,7 @@
super.D();
this.aL();
}
-@@ -329,7 +388,15 @@
+@@ -328,7 +387,15 @@
while (!this.serverCommandQueue.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
@@ -178,7 +178,7 @@
}
}
-@@ -536,16 +603,70 @@
+@@ -535,16 +602,70 @@
}
public String getPlugins() {