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

Player: Execute PlayerPreLoginEvent before banlist/whitelist checks, close #1831 (#1833)

Browse Source
This commit is contained in:
Oreo Oreoniv 2017-12-22 14:19:56 +03:00 committed by Dylan K. Taylor
parent 1896576a24
commit 8bf275cb8b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/Player.php
View File

@ -1828,6 +1828,13 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->setSkin($skin); $this->setSkin($skin);
$this->server->getPluginManager()->callEvent($ev = new PlayerPreLoginEvent($this, "Plugin reason"));
if($ev->isCancelled()){
$this->close("", $ev->getKickMessage());
return true;
}
if(!$this->server->isWhitelisted($this->iusername) and $this->kick("Server is white-listed", false)){ if(!$this->server->isWhitelisted($this->iusername) and $this->kick("Server is white-listed", false)){
return true; return true;
} }
@ -1839,13 +1846,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
return true; return true;
} }
$this->server->getPluginManager()->callEvent($ev = new PlayerPreLoginEvent($this, "Plugin reason"));
if($ev->isCancelled()){
$this->close("", $ev->getKickMessage());
return true;
}
if(!$packet->skipVerification){ if(!$packet->skipVerification){
$this->server->getScheduler()->scheduleAsyncTask(new VerifyLoginTask($this, $packet)); $this->server->getScheduler()->scheduleAsyncTask(new VerifyLoginTask($this, $packet));
}else{ }else{