mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-17 04:06:54 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Workaround for some plugins crashing clients during PlayerLoginEvent"

Browse Source 
This reverts commit 087a994393.
This commit is contained in:
Dylan K. Taylor
2017-09-23 13:23:19 +01:00
parent 0523f26613
commit 826ec90856
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/Player.php
View File

@@ -1868,6 +1868,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
protected function completeLoginSequence(){ protected function completeLoginSequence(){
parent::__construct($this->level, $this->namedtag); parent::__construct($this->level, $this->namedtag);
$this->server->getPluginManager()->callEvent($ev = new PlayerLoginEvent($this, "Plugin reason"));
if($ev->isCancelled()){
$this->close($this->getLeaveMessage(), $ev->getKickMessage());
return;
}
if(!$this->hasValidSpawnPosition()){ if(!$this->hasValidSpawnPosition()){
if(isset($this->namedtag->SpawnLevel) and ($level = $this->server->getLevelByName((string) $this->namedtag["SpawnLevel"])) instanceof Level){ if(isset($this->namedtag->SpawnLevel) and ($level = $this->server->getLevelByName((string) $this->namedtag["SpawnLevel"])) instanceof Level){
@@ -1905,13 +1911,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$pk->worldName = $this->server->getMotd(); $pk->worldName = $this->server->getMotd();
$this->dataPacket($pk); $this->dataPacket($pk);
$this->server->getPluginManager()->callEvent($ev = new PlayerLoginEvent($this, "Plugin reason"));
if($ev->isCancelled()){
$this->close($this->getLeaveMessage(), $ev->getKickMessage());
return;
}
$this->level->sendTime($this); $this->level->sendTime($this);
$this->sendAttributes(true); $this->sendAttributes(true);