From 92e81e329815799f52fa01f0ad5ff5f5f8ae8900 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 17 Jun 2019 16:27:04 +0100
Subject: [PATCH] Player: move some respawn net sync logic to NetworkSession

---
 src/pocketmine/Player.php                      | 6 ------
 src/pocketmine/network/mcpe/NetworkSession.php | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 081e95198..76fa81d6c 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -2530,12 +2530,6 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
 			$attr->resetToDefault();
 		}
 
-		$this->sendData($this);
-		$this->sendData($this->getViewers());
-
-		$this->networkSession->syncAdventureSettings($this);
-		$this->networkSession->syncAllInventoryContents();
-
 		$this->spawnToAll();
 		$this->scheduleUpdate();
 
diff --git a/src/pocketmine/network/mcpe/NetworkSession.php b/src/pocketmine/network/mcpe/NetworkSession.php
index b30ad7fb3..c4aa22908 100644
--- a/src/pocketmine/network/mcpe/NetworkSession.php
+++ b/src/pocketmine/network/mcpe/NetworkSession.php
@@ -586,6 +586,11 @@ class NetworkSession{
 	}
 
 	public function onRespawn() : void{
+		$this->player->sendData($this->player);
+		$this->player->sendData($this->player->getViewers());
+
+		$this->syncAdventureSettings($this->player);
+		$this->syncAllInventoryContents();
 		$this->setHandler(new InGameSessionHandler($this->player, $this));
 	}