mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-13 09:19:42 +00:00
Code Issues Projects Releases Wiki Activity

Moved skin checks after protocol checks

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-04-10 10:23:28 +02:00
parent 2ae095a15a
commit 0626d27003
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/Player.php
View File

@ -1340,12 +1340,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->nameTag = $this->username;
$this->iusername = strtolower($this->username);
$this->randomClientId = $packet->clientId;
if(strlen($packet->skin) < 64 * 32 * 4){
$this->close("", "Invalid skin", false);
return;
}
$this->setSkin($packet->skin, $packet->slim);
$this->loginData = ["clientId" => $packet->clientId, "loginData" => null];
if(count($this->server->getOnlinePlayers()) > $this->server->getMaxPlayers() and $this->kick("server full")){
@ -1365,12 +1359,20 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
return;
}
if(strpos($packet->username, "\x00") !== false or preg_match('#^[a-zA-Z0-9_]{3,16}$#', $packet->username) == 0 or $this->username === "" or $this->iusername === "rcon" or $this->iusername === "console" or strlen($packet->username) > 16 or strlen($packet->username) < 3){
$this->close("", "Bad username");
return;
}
if(strlen($packet->skin) < 64 * 32 * 4){
$this->close("", "Invalid skin", false);
return;
}
$this->setSkin($packet->skin, $packet->slim);
$this->server->getPluginManager()->callEvent($ev = new PlayerPreLoginEvent($this, "Plugin reason"));
if($ev->isCancelled()){
$this->close("", $ev->getKickMessage());