Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-09 04:09:54 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-1634: Fix cancelling ServerCommandEvent

Browse Source
This commit is contained in:
md_5 2016-03-03 16:56:07 +11:00
parent 78578ca517
commit f5f09ffcbf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nms-patches/DedicatedServer.patch
View File

@ -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() {