twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 04:05:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.3.2

Browse Source
This commit is contained in:
Travis Watkins
2012-08-24 19:51:51 -05:00
committed by EvilSeph
parent 35cff16da5
commit b8cc862083
18 changed files with 103 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/minecraft/server/DedicatedServer.java
View File

@@ -47,7 +47,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true));
// CraftBukkit end
log.info("Starting minecraft server version 1.3.1");
log.info("Starting minecraft server version 1.3.2");
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
}
@@ -189,7 +189,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
protected void a(CrashReport crashreport) {
while (this.isRunning()) {
this.ah();
this.ai();
try {
Thread.sleep(10L);
@@ -200,8 +200,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public CrashReport b(CrashReport crashreport) {
crashreport = super.b(crashreport);
crashreport.a("Type", (Callable) (new CrashReportType(this)));
return super.b(crashreport);
return crashreport;
}
protected void o() {
@@ -210,7 +211,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
public void q() {
super.q();
this.ah();
this.ai();
}
public boolean getAllowNether() {
@@ -222,8 +223,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public void a(MojangStatisticsGenerator mojangstatisticsgenerator) {
mojangstatisticsgenerator.a("whitelist_enabled", Boolean.valueOf(this.ai().getHasWhitelist()));
mojangstatisticsgenerator.a("whitelist_count", Integer.valueOf(this.ai().getWhitelisted().size()));
mojangstatisticsgenerator.a("whitelist_enabled", Boolean.valueOf(this.aj().getHasWhitelist()));
mojangstatisticsgenerator.a("whitelist_count", Integer.valueOf(this.aj().getWhitelisted().size()));
super.a(mojangstatisticsgenerator);
}
@@ -235,7 +236,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
this.l.add(new ServerCommand(s, icommandlistener));
}
public void ah() {
public void ai() {
while (!this.l.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.l.remove(0);
@@ -254,7 +255,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return true;
}
public ServerConfigurationManager ai() {
public ServerConfigurationManager aj() {
return (ServerConfigurationManager) super.getServerConfigurationManager();
}
@@ -288,7 +289,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return file1 != null ? file1.getAbsolutePath() : "No settings file";
}
public void aj() {
public void ak() {
ServerGUI.a(this);
this.s = true;
}
@@ -302,6 +303,6 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
}
public ServerConfigurationManagerAbstract getServerConfigurationManager() {
return this.ai();
return this.aj();
}
}