From 9b2b92ac1faeab03d18992baabf67689cdc47cd4 Mon Sep 17 00:00:00 2001 From: ShockedPlot7560 Date: Sun, 22 Oct 2023 15:05:06 +0200 Subject: [PATCH] oops, remove test code --- src/event/player/PlayerChatEvent.php | 5 +---- src/player/Player.php | 11 ++++------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/event/player/PlayerChatEvent.php b/src/event/player/PlayerChatEvent.php index 87151bc23..1cdbb49fb 100644 --- a/src/event/player/PlayerChatEvent.php +++ b/src/event/player/PlayerChatEvent.php @@ -24,8 +24,6 @@ declare(strict_types=1); namespace pocketmine\event\player; use pocketmine\command\CommandSender; -use pocketmine\event\AsyncEvent; -use pocketmine\event\AsyncEventTrait; use pocketmine\event\Cancellable; use pocketmine\event\CancellableTrait; use pocketmine\player\chat\ChatFormatter; @@ -35,9 +33,8 @@ use pocketmine\utils\Utils; /** * Called when a player chats something */ -class PlayerChatEvent extends PlayerEvent implements Cancellable, AsyncEvent{ +class PlayerChatEvent extends PlayerEvent implements Cancellable{ use CancellableTrait; - use AsyncEventTrait; /** * @param CommandSender[] $recipients diff --git a/src/player/Player.php b/src/player/Player.php index 9969ec8be..c9af9bb94 100644 --- a/src/player/Player.php +++ b/src/player/Player.php @@ -1513,13 +1513,10 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{ Timings::$playerCommand->stopTiming(); }else{ $ev = new PlayerChatEvent($this, $messagePart, $this->server->getBroadcastChannelSubscribers(Server::BROADCAST_CHANNEL_USERS), new StandardChatFormatter()); - $ev->callAsync() - ->onCompletion(function() use ($ev) { - if(!$ev->isCancelled()){ - $this->server->broadcastMessage($ev->getFormatter()->format($ev->getPlayer()->getDisplayName(), $ev->getMessage()), $ev->getRecipients()); - } - }, function (){ - }); + $ev->call(); + if(!$ev->isCancelled()){ + $this->server->broadcastMessage($ev->getFormatter()->format($ev->getPlayer()->getDisplayName(), $ev->getMessage()), $ev->getRecipients()); + } } }