mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-12 18:55:51 -07:00
Update to Minecraft 1.11
This commit is contained in:
@@ -98,7 +98,7 @@
|
||||
+
|
||||
thread.setDaemon(true);
|
||||
thread.start();
|
||||
DedicatedServer.LOGGER.info("Starting minecraft server version 1.10.2");
|
||||
DedicatedServer.LOGGER.info("Starting minecraft server version 1.11");
|
||||
@@ -78,7 +125,7 @@
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
this.r = new EULA(new File("eula.txt"));
|
||||
if (!this.r.a()) {
|
||||
DedicatedServer.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
|
||||
@@ -134,6 +181,8 @@
|
||||
@@ -135,6 +182,8 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -117,7 +117,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.");
|
||||
@@ -148,7 +197,7 @@
|
||||
@@ -149,7 +198,7 @@
|
||||
if (!NameReferencingFileConverter.a(this.propertyManager)) {
|
||||
return false;
|
||||
} else {
|
||||
@@ -126,7 +126,7 @@
|
||||
long j = System.nanoTime();
|
||||
|
||||
if (this.S() == null) {
|
||||
@@ -206,7 +255,18 @@
|
||||
@@ -207,7 +256,18 @@
|
||||
DedicatedServer.LOGGER.info("Starting remote control listener");
|
||||
this.p = new RemoteControlListener(this);
|
||||
this.p.a();
|
||||
@@ -143,18 +143,9 @@
|
||||
}
|
||||
+ // CraftBukkit end
|
||||
|
||||
if (this.aP() > 0L) {
|
||||
if (this.aQ() > 0L) {
|
||||
Thread thread1 = new Thread(new ThreadWatchdog(this));
|
||||
@@ -266,7 +326,7 @@
|
||||
return this.propertyManager.getBoolean("hardcore", false);
|
||||
}
|
||||
|
||||
- protected void a(CrashReport crashreport) {}
|
||||
+ public void a(CrashReport crashreport) {}
|
||||
|
||||
public CrashReport b(CrashReport crashreport) {
|
||||
crashreport = super.b(crashreport);
|
||||
@@ -293,11 +353,11 @@
|
||||
@@ -292,11 +352,11 @@
|
||||
return crashreport;
|
||||
}
|
||||
|
||||
@@ -166,9 +157,9 @@
|
||||
- protected void D() {
|
||||
+ public void D() { // CraftBukkit - fix decompile error
|
||||
super.D();
|
||||
this.aL();
|
||||
this.aM();
|
||||
}
|
||||
@@ -328,7 +388,15 @@
|
||||
@@ -327,7 +387,15 @@
|
||||
while (!this.serverCommandQueue.isEmpty()) {
|
||||
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
|
||||
|
||||
@@ -185,7 +176,7 @@
|
||||
}
|
||||
|
||||
}
|
||||
@@ -535,16 +603,70 @@
|
||||
@@ -534,16 +602,70 @@
|
||||
}
|
||||
|
||||
public String getPlugins() {
|
||||
@@ -252,7 +243,7 @@
|
||||
}
|
||||
|
||||
public PlayerList getPlayerList() {
|
||||
return this.aM();
|
||||
return this.aN();
|
||||
}
|
||||
+
|
||||
+ // CraftBukkit start
|
||||
|
Reference in New Issue
Block a user