From 1c96e7936c2049bb91257b0a93b8e88a65607708 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 8 Jan 2023 16:20:05 +0000 Subject: [PATCH] Remove dead translation code we don't translate raw string parameters anywhere else these days, so there's no reason to do so here either. The parameters array is already reduced to string[] by this point anyway. --- src/network/mcpe/NetworkSession.php | 3 --- src/network/mcpe/handler/DeathPacketHandler.php | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php index 0962e607f..f064731b2 100644 --- a/src/network/mcpe/NetworkSession.php +++ b/src/network/mcpe/NetworkSession.php @@ -937,9 +937,6 @@ class NetworkSession{ $language = $this->player->getLanguage(); $parameters = array_map(fn(string|Translatable $p) => $p instanceof Translatable ? $language->translate($p) : $p, $message->getParameters()); if(!$this->server->isLanguageForced()){ - foreach($parameters as $i => $p){ - $parameters[$i] = $language->translateString($p, [], "pocketmine."); - } $this->sendDataPacket(TextPacket::translation($language->translateString($message->getText(), $parameters, "pocketmine."), $parameters)); }else{ $this->sendDataPacket(TextPacket::raw($language->translateString($message->getText(), $parameters))); diff --git a/src/network/mcpe/handler/DeathPacketHandler.php b/src/network/mcpe/handler/DeathPacketHandler.php index 43deec463..dd8e78af8 100644 --- a/src/network/mcpe/handler/DeathPacketHandler.php +++ b/src/network/mcpe/handler/DeathPacketHandler.php @@ -56,9 +56,6 @@ class DeathPacketHandler extends PacketHandler{ $language = $this->player->getLanguage(); $parameters = array_map(fn(string|Translatable $p) => $p instanceof Translatable ? $language->translate($p) : $p, $this->deathMessage->getParameters()); if(!$this->player->getServer()->isLanguageForced()){ - foreach($parameters as $i => $p){ - $parameters[$i] = $language->translateString($p, [], "pocketmine."); - } $message = $language->translateString($this->deathMessage->getText(), $parameters, "pocketmine."); }else{ $message = $language->translateString($this->deathMessage->getText(), $parameters);