Updated version to 1.2.5-R0.1-SNAPSHOT

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;