Update for 1.1_01 renames.

We know these updates (can) break plugins bypassing Bukkit. They are needed for
smooth updates however. There will be another one right before before 1.1-R1.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 882b0732..eee44f63 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -63,7 +63,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
     public boolean spawnNPCs;
     public boolean pvpMode;
     public boolean allowFlight;
-    public String s;
+    public String motd;
     private RemoteStatusListener z;
     private RemoteControlListener A;
 
@@ -118,8 +118,8 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
         this.spawnNPCs = this.propertyManager.getBoolean("spawn-npcs", true);
         this.pvpMode = this.propertyManager.getBoolean("pvp", true);
         this.allowFlight = this.propertyManager.getBoolean("allow-flight", false);
-        this.s = this.propertyManager.getString("motd", "A Minecraft Server");
-        this.s.replace('\u00a7', '$');
+        this.motd = this.propertyManager.getString("motd", "A Minecraft Server");
+        this.motd.replace('\u00a7', '$');
         InetAddress inetaddress = null;
 
         if (this.t.length() > 0) {
@@ -565,7 +565,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
             // CraftBukkit start - ServerCommand for preprocessing
             ServerCommandEvent event = new ServerCommandEvent(Event.Type.SERVER_COMMAND, this.console, servercommand.command);
             this.server.getPluginManager().callEvent(event);
-            servercommand = new ServerCommand(event.getCommand(), servercommand.b);
+            servercommand = new ServerCommand(event.getCommand(), servercommand.source);
             // CraftBukkit end
 
             // this.consoleCommandHandler.handle(servercommand); // CraftBukkit - Removed its now called in server.dispatchCommand
@@ -654,7 +654,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
     }
 
     public String getServerAddress() {
-        return this.s;
+        return this.motd;
     }
 
     public String getVersion() {