summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/MinecraftServer.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2012-01-30 21:51:53 +0100
committerEvilSeph <evilseph@gmail.com>2012-02-18 13:06:12 -0500
commit137880b727a4870ead5e2f113c045685e5ff8222 (patch)
tree8cbf98b279141edf86255d6dcfae2e45dc35b9a2 /src/main/java/net/minecraft/server/MinecraftServer.java
parent3b634b14f669dccd6051660c80e36caf62123713 (diff)
downloadcraftbukkit-137880b727a4870ead5e2f113c045685e5ff8222.tar
craftbukkit-137880b727a4870ead5e2f113c045685e5ff8222.tar.gz
craftbukkit-137880b727a4870ead5e2f113c045685e5ff8222.tar.lz
craftbukkit-137880b727a4870ead5e2f113c045685e5ff8222.tar.xz
craftbukkit-137880b727a4870ead5e2f113c045685e5ff8222.zip
Deprecation cleanup.
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5e29a71d..b071c813 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -27,8 +27,8 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.LoggerOutputStream;
import org.bukkit.craftbukkit.scheduler.CraftScheduler;
import org.bukkit.craftbukkit.util.ServerShutdownThread;
-import org.bukkit.event.Event;
import org.bukkit.event.server.ServerCommandEvent;
+import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldInitEvent;
import org.bukkit.event.world.WorldLoadEvent;
import org.bukkit.event.world.WorldSaveEvent;
@@ -565,7 +565,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
ServerCommand servercommand = (ServerCommand) this.y.remove(0);
// CraftBukkit start - ServerCommand for preprocessing
- ServerCommandEvent event = new ServerCommandEvent(Event.Type.SERVER_COMMAND, this.console, servercommand.command);
+ ServerCommandEvent event = new ServerCommandEvent(this.console, servercommand.command);
this.server.getPluginManager().callEvent(event);
servercommand = new ServerCommand(event.getCommand(), servercommand.source);
// CraftBukkit end
@@ -711,7 +711,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
public String d(String s) {
RemoteControlCommandListener.instance.a();
// CraftBukkit start
- ServerCommandEvent event = new ServerCommandEvent(Event.Type.REMOTE_COMMAND, this.remoteConsole, s);
+ RemoteServerCommandEvent event = new RemoteServerCommandEvent(this.remoteConsole, s);
this.server.getPluginManager().callEvent(event);
ServerCommand servercommand = new ServerCommand(event.getCommand(), RemoteControlCommandListener.instance);
// this.consoleCommandHandler.handle(new ServerCommand(s, RemoteControlCommandListener.instance)); // CraftBukkit - removed