diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-23 11:32:19 +0000 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-23 11:33:41 +0000 |
| commit | bfca34cad47a4c7dcc31f67afe53bf4db85be15d (patch) | |
| tree | e90af469d29a3c5e5665901c49c5725be3f7fda8 | |
| parent | 6655b8903773bf52cbb95f2871b69d052c55be10 (diff) | |
| download | craftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.tar craftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.tar.gz craftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.tar.lz craftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.tar.xz craftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.zip | |
ConsoleCommandSender no longer has a default constructor, use ConsoleCommandSender(server). Added entity.getServer and updated the version number of mc
4 files changed, 8 insertions, 2 deletions
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<WorldServer> worlds = new ArrayList<WorldServer>(); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 1d9ee884..9547ae01 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -30,7 +30,7 @@ import org.bukkit.event.world.WorldEvent; public final class CraftServer implements Server { private final String serverName = "Craftbukkit"; private final String serverVersion; - private final String protocolVersion = "1.2_01"; + private final String protocolVersion = "1.3"; private final PluginManager pluginManager = new SimplePluginManager(this); private final BukkitScheduler scheduler = new CraftScheduler(this); private final CommandMap commandMap = new SimpleCommandMap(this); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 9a876741..63ffbb5c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -173,4 +173,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public String toString() { return "CraftEntity{" + "id=" + getEntityId() + '}'; } + + public CraftServer getServer() { + return server; + } } |