mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 20:28:31 +00:00
Code Issues Projects Releases Wiki Activity

Remove PlayerCommandPreprocessEvent

Browse Source 
closes #4284
This commit is contained in:
Dylan K. Taylor 2022-09-24 15:35:49 +01:00
parent 18c9ccb01c
commit f6a9949942
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 3 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/event/player/PlayerCommandPreprocessEvent.php
View File

@ -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;
}
}

14
src/player/Player.php
View File

@ -51,7 +51,6 @@ use pocketmine\event\player\PlayerBedLeaveEvent;
use pocketmine\event\player\PlayerBlockPickEvent; use pocketmine\event\player\PlayerBlockPickEvent;
use pocketmine\event\player\PlayerChangeSkinEvent; use pocketmine\event\player\PlayerChangeSkinEvent;
use pocketmine\event\player\PlayerChatEvent; use pocketmine\event\player\PlayerChatEvent;
use pocketmine\event\player\PlayerCommandPreprocessEvent;
use pocketmine\event\player\PlayerDeathEvent; use pocketmine\event\player\PlayerDeathEvent;
use pocketmine\event\player\PlayerDisplayNameChangeEvent; use pocketmine\event\player\PlayerDisplayNameChangeEvent;
use pocketmine\event\player\PlayerDropItemEvent; use pocketmine\event\player\PlayerDropItemEvent;
@ -1401,19 +1400,12 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$messagePart = substr($messagePart, 1); $messagePart = substr($messagePart, 1);
} }
$ev = new PlayerCommandPreprocessEvent($this, $messagePart); if(strpos($messagePart, "/") === 0){
$ev->call();
if($ev->isCancelled()){
break;
}
if(strpos($ev->getMessage(), "/") === 0){
Timings::$playerCommand->startTiming(); Timings::$playerCommand->startTiming();
$this->server->dispatchCommand($ev->getPlayer(), substr($ev->getMessage(), 1)); $this->server->dispatchCommand($this, substr($messagePart, 1));
Timings::$playerCommand->stopTiming(); Timings::$playerCommand->stopTiming();
}else{ }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(); $ev->call();
if(!$ev->isCancelled()){ if(!$ev->isCancelled()){
$this->server->broadcastMessage($this->getServer()->getLanguage()->translateString($ev->getFormat(), [$ev->getPlayer()->getDisplayName(), $ev->getMessage()]), $ev->getRecipients()); $this->server->broadcastMessage($this->getServer()->getLanguage()->translateString($ev->getFormat(), [$ev->getPlayer()->getDisplayName(), $ev->getMessage()]), $ev->getRecipients());