From 15eac8a65acc8b001d079190840a092c255a5718 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Tue, 6 Oct 2020 18:06:48 +0100
Subject: [PATCH] NetworkSession: renamed some instructions to imperative
 instead of onWhatever() these aren't listening to events, they are telling
 the client that an event has taken place.

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

diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php
index a8f5e8502..cdf0296f0 100644
--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@@ -610,11 +610,11 @@ class NetworkSession{
 
 		$this->logger->debug("Initiating resource packs phase");
 		$this->setHandler(new ResourcePacksPacketHandler($this, $this->server->getResourcePackManager(), function() : void{
-			$this->onResourcePacksDone();
+			$this->beginSpawnSequence();
 		}));
 	}
 
-	private function onResourcePacksDone() : void{
+	private function beginSpawnSequence() : void{
 		$this->createPlayer();
 
 		$this->setHandler(new PreSpawnPacketHandler($this->server, $this->player, $this));
@@ -623,7 +623,7 @@ class NetworkSession{
 		$this->logger->debug("Waiting for spawn chunks");
 	}
 
-	public function onTerrainReady() : void{
+	public function notifyTerrainReady() : void{
 		$this->logger->debug("Sending spawn notification, waiting for spawn response");
 		$this->sendDataPacket(PlayStatusPacket::create(PlayStatusPacket::PLAYER_SPAWN));
 		$this->setHandler(new SpawnResponsePacketHandler(function() : void{
diff --git a/src/player/Player.php b/src/player/Player.php
index 5ffe4fffb..8161b3826 100644
--- a/src/player/Player.php
+++ b/src/player/Player.php
@@ -790,7 +790,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 						}
 					}
 
-					$this->networkSession->onTerrainReady();
+					$this->networkSession->notifyTerrainReady();
 				}
 			});
 		}