diff options
| author | md_5 <git@md-5.net> | 2016-03-03 16:56:07 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-03 16:56:07 +1100 |
| commit | f5f09ffcbfbe6be42aa2ac3777d835cdeaccfffb (patch) | |
| tree | c0a2a46454516a88a1d66365e6903c83ea4e43d6 /nms-patches/DedicatedServer.patch | |
| parent | 78578ca517beebc5bea6cd3bbd4ae1fbc92fa1f9 (diff) | |
| download | craftbukkit-f5f09ffcbfbe6be42aa2ac3777d835cdeaccfffb.tar craftbukkit-f5f09ffcbfbe6be42aa2ac3777d835cdeaccfffb.tar.gz craftbukkit-f5f09ffcbfbe6be42aa2ac3777d835cdeaccfffb.tar.lz craftbukkit-f5f09ffcbfbe6be42aa2ac3777d835cdeaccfffb.tar.xz craftbukkit-f5f09ffcbfbe6be42aa2ac3777d835cdeaccfffb.zip | |
SPIGOT-1634: Fix cancelling ServerCommandEvent
Diffstat (limited to 'nms-patches/DedicatedServer.patch')
| -rw-r--r-- | nms-patches/DedicatedServer.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch index 414085ff..c259355e 100644 --- a/nms-patches/DedicatedServer.patch +++ b/nms-patches/DedicatedServer.patch @@ -161,7 +161,7 @@ super.D(); this.aL(); } -@@ -329,7 +388,14 @@ +@@ -329,7 +388,15 @@ while (!this.serverCommandQueue.isEmpty()) { ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0); @@ -169,6 +169,7 @@ + // CraftBukkit start - ServerCommand for preprocessing + ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command); + server.getPluginManager().callEvent(event); ++ if (event.isCancelled()) continue; + servercommand = new ServerCommand(event.getCommand(), servercommand.source); + + // this.getCommandHandler().a(servercommand.source, servercommand.command); // Called in dispatchServerCommand @@ -177,7 +178,7 @@ } } -@@ -536,16 +602,70 @@ +@@ -536,16 +603,70 @@ } public String getPlugins() { |