summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/MinecraftServer.java
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2012-03-02 19:31:06 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2012-03-02 19:31:06 +0000
commita42e710bbc7c3e694b059145725ff3232f771f13 (patch)
tree661dd3580b42fc37e4cc5842a9a8f2d4b878e330 /src/main/java/net/minecraft/server/MinecraftServer.java
parentcb669f72a04c9024c724ba362a66fa01d944d127 (diff)
downloadcraftbukkit-a42e710bbc7c3e694b059145725ff3232f771f13.tar
craftbukkit-a42e710bbc7c3e694b059145725ff3232f771f13.tar.gz
craftbukkit-a42e710bbc7c3e694b059145725ff3232f771f13.tar.lz
craftbukkit-a42e710bbc7c3e694b059145725ff3232f771f13.tar.xz
craftbukkit-a42e710bbc7c3e694b059145725ff3232f771f13.zip
Updated from 1.2.2 to 1.2.3. This fixes BUKKIT-943
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a0287ac5..36ebf8a0 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.2");
+ log.info("Starting minecraft server version 1.2.3");
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\"");
@@ -685,7 +685,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
}
public String getVersion() {
- return "1.2.2";
+ return "1.2.3";
}
public int getPlayerCount() {