diff --git a/src/event/player/PlayerCommandPreprocessEvent.php b/src/event/player/PlayerCommandPreprocessEvent.php deleted file mode 100644 index 5cbed294b9..0000000000 --- a/src/event/player/PlayerCommandPreprocessEvent.php +++ /dev/null @@ -1,62 +0,0 @@ -player = $player; - } - - public function getMessage() : string{ - return $this->message; - } - - public function setMessage(string $message) : void{ - $this->message = $message; - } - - public function setPlayer(Player $player) : void{ - $this->player = $player; - } -} diff --git a/src/player/Player.php b/src/player/Player.php index 75c87ff805..5ced7dd254 100644 --- a/src/player/Player.php +++ b/src/player/Player.php @@ -51,7 +51,6 @@ use pocketmine\event\player\PlayerBedLeaveEvent; use pocketmine\event\player\PlayerBlockPickEvent; use pocketmine\event\player\PlayerChangeSkinEvent; use pocketmine\event\player\PlayerChatEvent; -use pocketmine\event\player\PlayerCommandPreprocessEvent; use pocketmine\event\player\PlayerDeathEvent; use pocketmine\event\player\PlayerDisplayNameChangeEvent; use pocketmine\event\player\PlayerDropItemEvent; @@ -1401,19 +1400,12 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{ $messagePart = substr($messagePart, 1); } - $ev = new PlayerCommandPreprocessEvent($this, $messagePart); - $ev->call(); - - if($ev->isCancelled()){ - break; - } - - if(strpos($ev->getMessage(), "/") === 0){ + if(strpos($messagePart, "/") === 0){ Timings::$playerCommand->startTiming(); - $this->server->dispatchCommand($ev->getPlayer(), substr($ev->getMessage(), 1)); + $this->server->dispatchCommand($this, substr($messagePart, 1)); Timings::$playerCommand->stopTiming(); }else{ - $ev = new PlayerChatEvent($this, $ev->getMessage(), $this->server->getBroadcastChannelSubscribers(Server::BROADCAST_CHANNEL_USERS)); + $ev = new PlayerChatEvent($this, $messagePart, $this->server->getBroadcastChannelSubscribers(Server::BROADCAST_CHANNEL_USERS)); $ev->call(); if(!$ev->isCancelled()){ $this->server->broadcastMessage($this->getServer()->getLanguage()->translateString($ev->getFormat(), [$ev->getPlayer()->getDisplayName(), $ev->getMessage()]), $ev->getRecipients());