summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/DedicatedServer.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-08-24 19:51:51 -0500
committerEvilSeph <evilseph@gmail.com>2012-08-25 00:54:21 -0400
commitb8cc86208310513232e27d543ec9b6c153ab1421 (patch)
tree0d7d772e5bb878b189fd4c5bd74c84878aaf088d /src/main/java/net/minecraft/server/DedicatedServer.java
parent35cff16da572292785201dfb683413623efd0a43 (diff)
downloadcraftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.tar
craftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.tar.gz
craftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.tar.lz
craftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.tar.xz
craftbukkit-b8cc86208310513232e27d543ec9b6c153ab1421.zip
Update to 1.3.2
Diffstat (limited to 'src/main/java/net/minecraft/server/DedicatedServer.java')
-rw-r--r--src/main/java/net/minecraft/server/DedicatedServer.java21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 66a517ff..92b4c949 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -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();
}
}