diff options
author | rmichela <deltahat@gmail.com> | 2012-01-19 03:32:05 -0500 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-03-01 04:33:59 -0500 |
commit | 1161de3f638e187e17677697b3663e13381b9d3d (patch) | |
tree | ecf371a6ae341603f8e347447b3b5d9dd4576adc /src/main/java/net/minecraft/server/MinecraftServer.java | |
parent | 818a61040e0e382f2fb1a385b657601b194b0083 (diff) | |
download | craftbukkit-1161de3f638e187e17677697b3663e13381b9d3d.tar craftbukkit-1161de3f638e187e17677697b3663e13381b9d3d.tar.gz craftbukkit-1161de3f638e187e17677697b3663e13381b9d3d.tar.lz craftbukkit-1161de3f638e187e17677697b3663e13381b9d3d.tar.xz craftbukkit-1161de3f638e187e17677697b3663e13381b9d3d.zip |
[Bleeding] Added Conversations API. Addresses BUKKIT-864
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/MinecraftServer.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index b4e886a6..be06b2c9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,6 +1,5 @@ package net.minecraft.server; -import java.awt.GraphicsEnvironment; import java.io.File; import java.io.IOException; import java.net.InetAddress; @@ -570,8 +569,8 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe servercommand = new ServerCommand(event.getCommand(), servercommand.source); // CraftBukkit end - // this.consoleCommandHandler.handle(servercommand); // CraftBukkit - Removed its now called in server.dispatchCommand - this.server.dispatchCommand(this.console, servercommand); // CraftBukkit + // this.consoleCommandHandler.handle(servercommand); // CraftBukkit - Removed its now called in server.dispatchServerCommand + this.server.dispatchServerCommand(this.console, servercommand); // CraftBukkit } } @@ -715,7 +714,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe this.server.getPluginManager().callEvent(event); ServerCommand servercommand = new ServerCommand(event.getCommand(), RemoteControlCommandListener.instance); // this.consoleCommandHandler.handle(new ServerCommand(s, RemoteControlCommandListener.instance)); // CraftBukkit - removed - this.server.dispatchCommand(this.remoteConsole, servercommand); // CraftBukkit + this.server.dispatchServerCommand(this.remoteConsole, servercommand); // CraftBukkit // CraftBukkit end return RemoteControlCommandListener.instance.b(); } |