summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-01-14 13:47:47 +0000
committerDinnerbone <dinnerbone@dinnerbone.com>2011-01-14 13:47:47 +0000
commitdea7d3a81d21c27294256b37eb305744abcba25a (patch)
tree88d2750a95efb3c1635c71fd07c7d0e20c4c0177 /src/main
parent2761b598452d992b05a384528b54298ab1166456 (diff)
downloadcraftbukkit-dea7d3a81d21c27294256b37eb305744abcba25a.tar
craftbukkit-dea7d3a81d21c27294256b37eb305744abcba25a.tar.gz
craftbukkit-dea7d3a81d21c27294256b37eb305744abcba25a.tar.lz
craftbukkit-dea7d3a81d21c27294256b37eb305744abcba25a.tar.xz
craftbukkit-dea7d3a81d21c27294256b37eb305744abcba25a.zip
Update to Minecraft Server 1.2_01
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java2
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java1
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java2
3 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fafcc071..e75475a2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -61,7 +61,7 @@ public class MinecraftServer implements ICommandListener, Runnable {
((Thread) (threadcommandreader)).setDaemon(true);
((Thread) (threadcommandreader)).start();
ConsoleLogManager.a();
- a.info("Starting minecraft server version Beta 1.2");
+ a.info("Starting minecraft server version Beta 1.2_01");
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
a.warning("**** NOT ENOUGH RAM!");
a.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index a769a4c0..58437b1a 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -583,7 +583,6 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
}
public void a(Packet19 packet19) {
- System.out.println((new StringBuilder()).append("handlePlayerCommand ").append(packet19.a).append(" ").append(packet19.b).toString());
if (packet19.b == 1) {
e.b(true);
} else if (packet19.b == 2) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c60118ce..fe76a970 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -16,7 +16,7 @@ import org.bukkit.plugin.java.JavaPluginLoader;
public final class CraftServer implements Server {
private final String serverName = "Craftbukkit";
- private final String serverVersion = "1.1";
+ private final String serverVersion = "1.2_01";
private final PluginManager pluginManager = new SimplePluginManager(this);
protected final MinecraftServer console;