diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php index 946fbd92f..a8c68f8e8 100644 --- a/src/network/mcpe/NetworkSession.php +++ b/src/network/mcpe/NetworkSession.php @@ -34,6 +34,7 @@ use pocketmine\event\server\DataPacketReceiveEvent; use pocketmine\event\server\DataPacketSendEvent; use pocketmine\form\Form; use pocketmine\lang\KnownTranslationFactory; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\math\Vector3; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\StringTag; @@ -590,7 +591,7 @@ class NetworkSession{ if(!$this->authenticated){ if($authRequired){ - $this->disconnect("disconnectionScreen.notAuthenticated"); + $this->disconnect(KnownTranslationKeys::DISCONNECTIONSCREEN_NOTAUTHENTICATED); return; } if($this->info instanceof XboxLivePlayerInfo){ diff --git a/src/network/mcpe/handler/LoginPacketHandler.php b/src/network/mcpe/handler/LoginPacketHandler.php index 25532f172..3ff77e2c4 100644 --- a/src/network/mcpe/handler/LoginPacketHandler.php +++ b/src/network/mcpe/handler/LoginPacketHandler.php @@ -26,6 +26,7 @@ namespace pocketmine\network\mcpe\handler; use pocketmine\entity\InvalidSkinException; use pocketmine\event\player\PlayerPreLoginEvent; use pocketmine\lang\KnownTranslationFactory; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\network\mcpe\auth\ProcessLoginTask; use pocketmine\network\mcpe\convert\SkinAdapterSingleton; use pocketmine\network\mcpe\JwtException; @@ -93,7 +94,7 @@ class LoginPacketHandler extends PacketHandler{ $extraData = $this->fetchAuthData($packet->chainDataJwt); if(!Player::isValidUserName($extraData->displayName)){ - $this->session->disconnect("disconnectionScreen.invalidName"); + $this->session->disconnect(KnownTranslationKeys::DISCONNECTIONSCREEN_INVALIDNAME); return true; } @@ -103,7 +104,7 @@ class LoginPacketHandler extends PacketHandler{ $skin = SkinAdapterSingleton::get()->fromSkinData(ClientDataToSkinDataHelper::fromClientData($clientData)); }catch(\InvalidArgumentException | InvalidSkinException $e){ $this->session->getLogger()->debug("Invalid skin: " . $e->getMessage()); - $this->session->disconnect("disconnectionScreen.invalidSkin"); + $this->session->disconnect(KnownTranslationKeys::DISCONNECTIONSCREEN_INVALIDSKIN); return true; } @@ -139,7 +140,7 @@ class LoginPacketHandler extends PacketHandler{ $this->server->requiresAuthentication() ); if($this->server->getNetwork()->getConnectionCount() > $this->server->getMaxPlayers()){ - $ev->setKickReason(PlayerPreLoginEvent::KICK_REASON_SERVER_FULL, "disconnectionScreen.serverFull"); + $ev->setKickReason(PlayerPreLoginEvent::KICK_REASON_SERVER_FULL, KnownTranslationKeys::DISCONNECTIONSCREEN_SERVERFULL); } if(!$this->server->isWhitelisted($playerInfo->getUsername())){ $ev->setKickReason(PlayerPreLoginEvent::KICK_REASON_SERVER_WHITELISTED, "Server is whitelisted"); diff --git a/src/network/mcpe/handler/ResourcePacksPacketHandler.php b/src/network/mcpe/handler/ResourcePacksPacketHandler.php index 23676b436..5b6d1d7a5 100644 --- a/src/network/mcpe/handler/ResourcePacksPacketHandler.php +++ b/src/network/mcpe/handler/ResourcePacksPacketHandler.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\handler; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\ResourcePackChunkDataPacket; use pocketmine\network\mcpe\protocol\ResourcePackChunkRequestPacket; @@ -83,7 +84,7 @@ class ResourcePacksPacketHandler extends PacketHandler{ private function disconnectWithError(string $error) : void{ $this->session->getLogger()->error("Error downloading resource packs: " . $error); - $this->session->disconnect("disconnectionScreen.resourcePack"); + $this->session->disconnect(KnownTranslationKeys::DISCONNECTIONSCREEN_RESOURCEPACK); } public function handleResourcePackClientResponse(ResourcePackClientResponsePacket $packet) : bool{ diff --git a/src/player/Player.php b/src/player/Player.php index 174d833a3..7ecb53b4f 100644 --- a/src/player/Player.php +++ b/src/player/Player.php @@ -81,6 +81,7 @@ use pocketmine\item\Item; use pocketmine\item\ItemUseResult; use pocketmine\item\Releasable; use pocketmine\lang\KnownTranslationFactory; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\Language; use pocketmine\lang\Translatable; use pocketmine\math\Vector3; @@ -1879,7 +1880,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{ if(!$ev->isCancelled()){ $reason = $ev->getReason(); if($reason === ""){ - $reason = "disconnectionScreen.noReason"; + $reason = KnownTranslationKeys::DISCONNECTIONSCREEN_NOREASON; } $this->disconnect($reason, $ev->getQuitMessage());