From 826ec90856dcce7aed07db4506df6a8d5e74aa05 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 23 Sep 2017 13:23:19 +0100 Subject: [PATCH] Revert "Workaround for some plugins crashing clients during PlayerLoginEvent" This reverts commit 087a994393be23f694c6d0585bcd3797a15bf50b. --- src/pocketmine/Player.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 34bf931bb..c594d83bb 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1868,6 +1868,12 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ protected function completeLoginSequence(){ 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(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(); $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->sendAttributes(true);