From 5df916099d3c0b846ea1d27dc9338a21b16bf08b Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 27 Oct 2016 22:08:27 +0100 Subject: [PATCH] Fire PlayerCommandPreProcessEvent for CommandStepPacket --- src/pocketmine/Player.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 2a0d44f81..a730741f7 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -2508,14 +2508,19 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade break; } $this->craftingType = 0; - Timings::$playerCommandTimer->startTiming(); $commandText = $packet->command; if($packet->args !== null){ foreach($packet->args as $arg){ //command ordering will be an issue $commandText .= " " . $arg; } } - $this->server->dispatchCommand($this, $commandText); + $this->server->getPluginManager()->callEvent($ev = new PlayerCommandPreprocessEvent($this, $commandText)); + if($ev->isCancelled()){ + break; + } + + Timings::$playerCommandTimer->startTiming(); + $this->server->dispatchCommand($ev->getPlayer(), $ev->getMessage()); Timings::$playerCommandTimer->stopTiming(); break; case ProtocolInfo::TEXT_PACKET: