From dea7d3a81d21c27294256b37eb305744abcba25a Mon Sep 17 00:00:00 2001 From: Dinnerbone Date: Fri, 14 Jan 2011 13:47:47 +0000 Subject: [PATCH] Update to Minecraft Server 1.2_01 --- pom.xml | 2 +- src/main/java/net/minecraft/server/MinecraftServer.java | 2 +- src/main/java/net/minecraft/server/NetServerHandler.java | 1 - src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d704fc54f..f08ed9e92 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.bukkit minecraft-server - 1.2 + 1.2_01 jar compile diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index fafcc0710..e75475a27 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 a769a4c01..58437b1a7 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 c60118ced..fe76a9706 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;