From d2eddf9d3346bb30bbd4ff1c1c7b15f165c84b32 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 8 Jan 2023 20:56:51 +0000 Subject: [PATCH] relocate comments --- src/network/mcpe/NetworkSession.php | 2 +- src/network/mcpe/handler/DeathPacketHandler.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php index ca4ad258a..7d5c4cbd3 100644 --- a/src/network/mcpe/NetworkSession.php +++ b/src/network/mcpe/NetworkSession.php @@ -933,9 +933,9 @@ class NetworkSession{ public function onChatMessage(Translatable|string $message) : void{ if($message instanceof Translatable){ - //we can't send nested translations to the client, so make sure they are always pre-translated by the server $language = $this->player->getLanguage(); if(!$this->server->isLanguageForced()){ + //we can't send nested translations to the client, so make sure they are always pre-translated by the server $parameters = array_map(fn(string|Translatable $p) => $p instanceof Translatable ? $language->translate($p) : $p, $message->getParameters()); $this->sendDataPacket(TextPacket::translation($language->translateString($message->getText(), $parameters, "pocketmine."), $parameters)); }else{ diff --git a/src/network/mcpe/handler/DeathPacketHandler.php b/src/network/mcpe/handler/DeathPacketHandler.php index f1d887100..6347d8f65 100644 --- a/src/network/mcpe/handler/DeathPacketHandler.php +++ b/src/network/mcpe/handler/DeathPacketHandler.php @@ -52,9 +52,9 @@ class DeathPacketHandler extends PacketHandler{ /** @var string[] $parameters */ $parameters = []; if($this->deathMessage instanceof Translatable){ - //we can't send nested translations to the client, so make sure they are always pre-translated by the server $language = $this->player->getLanguage(); if(!$this->player->getServer()->isLanguageForced()){ + //we can't send nested translations to the client, so make sure they are always pre-translated by the server $parameters = array_map(fn(string|Translatable $p) => $p instanceof Translatable ? $language->translate($p) : $p, $this->deathMessage->getParameters()); $message = $language->translateString($this->deathMessage->getText(), $parameters, "pocketmine."); }else{