From 6954bfac4b38a70769b432cfcd9779bcfda18dad Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sat, 17 Feb 2018 19:51:04 +0000
Subject: [PATCH] Removed RakNet client ID parameters from Player This is not
 used anywhere anymore and null is always filled for this, so it's pointless.

Also, this is an API break.
---
 src/pocketmine/Player.php                           |  5 +----
 src/pocketmine/event/player/PlayerCreationEvent.php | 13 +------------
 src/pocketmine/network/mcpe/RakLibInterface.php     |  4 ++--
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index f4d8371c4..9ecc0f6cc 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -243,7 +243,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	protected $startAction = -1;
 	/** @var Vector3|null */
 	protected $sleeping = null;
-	protected $clientID = null;
 
 	private $loaderId = 0;
 
@@ -678,18 +677,16 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 
 	/**
 	 * @param SourceInterface $interface
-	 * @param null            $clientID
 	 * @param string          $ip
 	 * @param int             $port
 	 */
-	public function __construct(SourceInterface $interface, $clientID, string $ip, int $port){
+	public function __construct(SourceInterface $interface, string $ip, int $port){
 		$this->interface = $interface;
 		$this->perm = new PermissibleBase($this);
 		$this->namedtag = new CompoundTag();
 		$this->server = Server::getInstance();
 		$this->ip = $ip;
 		$this->port = $port;
-		$this->clientID = $clientID;
 		$this->loaderId = Level::generateChunkLoaderId($this);
 		$this->chunksPerTick = (int) $this->server->getProperty("chunk-sending.per-tick", 4);
 		$this->spawnThreshold = (int) (($this->server->getProperty("chunk-sending.spawn-radius", 4) ** 2) * M_PI);
diff --git a/src/pocketmine/event/player/PlayerCreationEvent.php b/src/pocketmine/event/player/PlayerCreationEvent.php
index cd22f5928..10fda29b6 100644
--- a/src/pocketmine/event/player/PlayerCreationEvent.php
+++ b/src/pocketmine/event/player/PlayerCreationEvent.php
@@ -35,8 +35,6 @@ class PlayerCreationEvent extends Event{
 
 	/** @var SourceInterface */
 	private $interface;
-	/** @var mixed */
-	private $clientId;
 	/** @var string */
 	private $address;
 	/** @var int */
@@ -51,13 +49,11 @@ class PlayerCreationEvent extends Event{
 	 * @param SourceInterface $interface
 	 * @param Player::class   $baseClass
 	 * @param Player::class   $playerClass
-	 * @param mixed           $clientId
 	 * @param string          $address
 	 * @param int             $port
 	 */
-	public function __construct(SourceInterface $interface, $baseClass, $playerClass, $clientId, string $address, int $port){
+	public function __construct(SourceInterface $interface, $baseClass, $playerClass, string $address, int $port){
 		$this->interface = $interface;
-		$this->clientId = $clientId;
 		$this->address = $address;
 		$this->port = $port;
 
@@ -95,13 +91,6 @@ class PlayerCreationEvent extends Event{
 		return $this->port;
 	}
 
-	/**
-	 * @return mixed
-	 */
-	public function getClientId(){
-		return $this->clientId;
-	}
-
 	/**
 	 * @return Player::class
 	 */
diff --git a/src/pocketmine/network/mcpe/RakLibInterface.php b/src/pocketmine/network/mcpe/RakLibInterface.php
index 09cb488c9..442efd265 100644
--- a/src/pocketmine/network/mcpe/RakLibInterface.php
+++ b/src/pocketmine/network/mcpe/RakLibInterface.php
@@ -128,11 +128,11 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
 	}
 
 	public function openSession($identifier, $address, $port, $clientID){
-		$ev = new PlayerCreationEvent($this, Player::class, Player::class, null, $address, $port);
+		$ev = new PlayerCreationEvent($this, Player::class, Player::class, $address, $port);
 		$this->server->getPluginManager()->callEvent($ev);
 		$class = $ev->getPlayerClass();
 
-		$player = new $class($this, $ev->getClientId(), $ev->getAddress(), $ev->getPort());
+		$player = new $class($this, $ev->getAddress(), $ev->getPort());
 		$this->players[$identifier] = $player;
 		$this->identifiersACK[$identifier] = 0;
 		$this->identifiers[spl_object_hash($player)] = $identifier;