mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-24 11:54:23 +00:00
Code Issues Projects Releases Wiki Activity

Player: break cycle between sendMessage() and sendTranslation()

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-12-22 16:37:36 +00:00
parent 566a8a261f
commit 9c9929ff39
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/player/Player.php
View File

@ -1995,7 +1995,16 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
*/ */
public function sendMessage(Translatable|string $message) : void{ public function sendMessage(Translatable|string $message) : void{
if($message instanceof Translatable){ if($message instanceof Translatable){
$this->sendTranslation($message->getText(), $message->getParameters()); //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 ? $this->getLanguage()->translate($p) : $p, $message->getParameters());
if(!$this->server->isLanguageForced()){
foreach($parameters as $i => $p){
$parameters[$i] = $this->getLanguage()->translateString($p, [], "pocketmine.");
}
$this->getNetworkSession()->onTranslatedChatMessage($this->getLanguage()->translateString($message->getText(), $parameters, "pocketmine."), $parameters);
}else{
$this->getNetworkSession()->onRawChatMessage($this->getLanguage()->translateString($message->getText(), $parameters));
}
return; return;
} }
@ -2007,16 +2016,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
* @param string[]|Translatable[] $parameters * @param string[]|Translatable[] $parameters
*/ */
public function sendTranslation(string $message, array $parameters = []) : void{ public function sendTranslation(string $message, array $parameters = []) : void{
//we can't send nested translations to the client, so make sure they are always pre-translated by the server $this->sendMessage(new Translatable($message, $parameters));
$parameters = array_map(fn(string|Translatable $p) => $p instanceof Translatable ? $this->getLanguage()->translate($p) : $p, $parameters);
if(!$this->server->isLanguageForced()){
foreach($parameters as $i => $p){
$parameters[$i] = $this->getLanguage()->translateString($p, [], "pocketmine.");
}
$this->getNetworkSession()->onTranslatedChatMessage($this->getLanguage()->translateString($message, $parameters, "pocketmine."), $parameters);
}else{
$this->sendMessage($this->getLanguage()->translateString($message, $parameters));
}
} }
/** /**