From 8637e0224ff2bcd438903ee1b376371773b100bd Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 17 Jun 2017 19:30:37 +0100 Subject: [PATCH] Check protocol version before anything else --- src/pocketmine/Player.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 8bde1fb12..51d3ae6f5 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1927,15 +1927,6 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade return false; } - $this->username = TextFormat::clean($packet->username); - $this->displayName = $this->username; - $this->iusername = strtolower($this->username); - $this->setDataProperty(self::DATA_NAMETAG, self::DATA_TYPE_STRING, $this->username, false); - - if(count($this->server->getOnlinePlayers()) >= $this->server->getMaxPlayers() and $this->kick("disconnectionScreen.serverFull", false)){ - return true; - } - if($packet->protocol !== ProtocolInfo::CURRENT_PROTOCOL){ if($packet->protocol < ProtocolInfo::CURRENT_PROTOCOL){ $message = "disconnectionScreen.outdatedClient"; @@ -1949,6 +1940,15 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade return true; } + $this->username = TextFormat::clean($packet->username); + $this->displayName = $this->username; + $this->iusername = strtolower($this->username); + $this->setDataProperty(self::DATA_NAMETAG, self::DATA_TYPE_STRING, $this->username, false); + + if(count($this->server->getOnlinePlayers()) >= $this->server->getMaxPlayers() and $this->kick("disconnectionScreen.serverFull", false)){ + return true; + } + $this->randomClientId = $packet->clientId; $this->uuid = UUID::fromString($packet->clientUUID);