From f6a99499423aecdd872f6eeb7b9728cf73d6164c Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Sat, 24 Sep 2022 15:35:49 +0100
Subject: [PATCH] Remove PlayerCommandPreprocessEvent closes #4284

---
 .../player/PlayerCommandPreprocessEvent.php   | 62 -------------------
 src/player/Player.php                         | 14 +----
 2 files changed, 3 insertions(+), 73 deletions(-)
 delete mode 100644 src/event/player/PlayerCommandPreprocessEvent.php

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 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\event\player;
-
-use pocketmine\event\Cancellable;
-use pocketmine\event\CancellableTrait;
-use pocketmine\event\server\CommandEvent;
-use pocketmine\player\Player;
-
-/**
- * Called when a player runs a command or chats, before it is processed.
- *
- * If the message is prefixed with a / (forward slash), it will be interpreted as a command.
- * Otherwise, it will be broadcasted as a chat message.
- *
- * @deprecated
- * @see PlayerChatEvent to handle chat messages
- * @see CommandEvent to intercept commands
- */
-class PlayerCommandPreprocessEvent extends PlayerEvent implements Cancellable{
-	use CancellableTrait;
-
-	public function __construct(
-		Player $player,
-		protected string $message
-	){
-		$this->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());