From bfca34cad47a4c7dcc31f67afe53bf4db85be15d Mon Sep 17 00:00:00 2001 From: Dinnerbone Date: Wed, 23 Feb 2011 11:32:19 +0000 Subject: ConsoleCommandSender no longer has a default constructor, use ConsoleCommandSender(server). Added entity.getServer and updated the version number of mc --- src/main/java/net/minecraft/server/MinecraftServer.java | 2 +- src/main/java/net/minecraft/server/ServerConfigurationManager.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/net/minecraft') diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 79911fe8..36487c3f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -50,7 +50,7 @@ public class MinecraftServer implements Runnable, ICommandListener { public List worlds = new ArrayList(); public CraftServer server; public OptionSet options; - public ConsoleCommandSender console = new ConsoleCommandSender(); + public ConsoleCommandSender console; // Craftbukkit end public MinecraftServer(OptionSet options) { // Craftbukkit - adds argument OptionSet diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 273d1803..961caad4 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -14,6 +14,7 @@ import java.util.logging.Logger; // CraftBukkit start import org.bukkit.Location; +import org.bukkit.command.ConsoleCommandSender; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.entity.Player; @@ -47,6 +48,7 @@ public class ServerConfigurationManager { public ServerConfigurationManager(MinecraftServer minecraftserver) { minecraftserver.server = new CraftServer(minecraftserver, this); + minecraftserver.console = new ConsoleCommandSender(minecraftserver.server); server = minecraftserver.server; // CraftBukkit end -- cgit v1.2.3