diff options
author | Dinnerbone (Laptop) <dinnerbone@dinnerbone.com> | 2012-03-30 23:33:51 +0200 |
---|---|---|
committer | Dinnerbone (Laptop) <dinnerbone@dinnerbone.com> | 2012-03-30 23:33:51 +0200 |
commit | 1fa4d8430e4174d0f8eb5d50667d0247f7877679 (patch) | |
tree | a806cee32737d36dbb27576c564d3099f336fbe7 /src/main/java/net/minecraft/server/MinecraftServer.java | |
parent | e0c01154b030c527815e884b6b331c5534ab247f (diff) | |
download | craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar.gz craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar.lz craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar.xz craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.zip |
Updated version to 1.2.5-R0.1-SNAPSHOT
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/MinecraftServer.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 00d7ae91..c86d054c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -112,7 +112,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe System.setErr(new PrintStream(new LoggerOutputStream(log, Level.SEVERE), true)); // CraftBukkit end - log.info("Starting minecraft server version 1.2.4"); + log.info("Starting minecraft server version 1.2.5"); if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { log.warning("**** NOT ENOUGH RAM!"); log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); @@ -185,13 +185,10 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe this.propertyManager.a("max-build-height", Integer.valueOf(this.t)); log.info("Preparing level \"" + s + "\""); this.a(new WorldLoaderServer(server.getWorldContainer()), s, j, worldtype); // CraftBukkit - world container + long l = System.nanoTime() - i; + String s3 = String.format("%.3fs", new Object[] { Double.valueOf((double) l / 1.0E9D)}); - // CraftBukkit start - display seconds for the completion time - long elapsed = System.nanoTime() - i; - String time = String.format("%.3fs", elapsed / 1000000000.0D); - log.info("Done (" + time + ")! For help, type \"help\" or \"?\""); - // CraftBukkit end - + log.info("Done (" + s3 + ")! For help, type \"help\" or \"?\""); if (this.propertyManager.getBoolean("enable-query", false)) { log.info("Starting GS4 status listener"); this.I = new RemoteStatusListener(this); @@ -685,7 +682,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe } public String getVersion() { - return "1.2.4"; + return "1.2.5"; } public int getPlayerCount() { @@ -766,6 +763,10 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe public String[] r() { return (String[]) this.serverConfigurationManager.getBannedPlayers().toArray(new String[0]); } + + public String getServerModName() { + return "craftbukkit"; + } public static boolean isRunning(MinecraftServer minecraftserver) { return minecraftserver.isRunning; |