From 973d5dc2516837f79567e3dbaea2ae4118393e8d Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 28 Feb 2018 18:40:32 +0000
Subject: [PATCH] Small de-spaghettification of login handling no need for
 these to be split up, it just makes the player login code flow look
 confusing.

---
 src/pocketmine/Player.php | 3 ++-
 src/pocketmine/Server.php | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 86dc3a3d9..290eda85a 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -2080,9 +2080,10 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$this->armorInventory->sendContents($this);
 		$this->inventory->sendCreativeContents();
 		$this->inventory->sendHeldItem($this);
+		$this->dataPacket($this->server->getCraftingManager()->getCraftingDataPacket());
 
 		$this->server->addOnlinePlayer($this);
-		$this->server->onPlayerCompleteLoginSequence($this);
+		$this->server->sendFullPlayerListData($this);
 	}
 
 	/**
diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index 90b476829..f5fead23f 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -2253,11 +2253,6 @@ class Server{
 		$this->loggedInPlayers[$player->getRawUniqueId()] = $player;
 	}
 
-	public function onPlayerCompleteLoginSequence(Player $player){
-		$this->sendFullPlayerListData($player);
-		$player->dataPacket($this->craftingManager->getCraftingDataPacket());
-	}
-
 	public function onPlayerLogout(Player $player){
 		unset($this->loggedInPlayers[$player->getRawUniqueId()]);
 	}