From 1161de3f638e187e17677697b3663e13381b9d3d Mon Sep 17 00:00:00 2001 From: rmichela Date: Thu, 19 Jan 2012 03:32:05 -0500 Subject: [Bleeding] Added Conversations API. Addresses BUKKIT-864 --- src/main/java/net/minecraft/server/MinecraftServer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java') 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(); } -- cgit v1.2.3