OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-24 09:16:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-1111: Fix ServerCommandEvent not being cancelled.

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2015-08-08 18:42:24 +10:00
parent 4d40084c65
commit 280ae804ee
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
paper-server/nms-patches/DedicatedServer.patch
View file

@ -162,7 +162,7 @@
super.B();
this.aO();
}
@@ -296,7 +362,14 @@
@@ -296,7 +362,15 @@
while (!this.l.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.l.remove(0);
@ -170,6 +170,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
@ -178,7 +179,7 @@
}
}
@@ -491,13 +564,60 @@
@@ -491,13 +565,60 @@
}
public String getPlugins() {