From 7a1cdf88e8fe962270f9e1ab7950335c7eefd06e Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sun, 30 Oct 2016 19:21:48 +0000
Subject: [PATCH] Fixed bugs related to #24 such as getName() on null

---
 src/pocketmine/Player.php             |  9 ++--
 src/pocketmine/level/Position.php     |  2 +-
 src/pocketmine/level/WeakPosition.php | 78 +++++++++++++++++++++++++++
 3 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 src/pocketmine/level/WeakPosition.php

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 4fc4c1d04..b486f558f 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -86,6 +86,7 @@ use pocketmine\level\Level;
 use pocketmine\level\Location;
 use pocketmine\level\Position;
 use pocketmine\level\sound\LaunchSound;
+use pocketmine\level\WeakPosition;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector2;
 use pocketmine\math\Vector3;
@@ -228,7 +229,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 	protected $viewDistance;
 	protected $chunksPerTick;
 	protected $spawnThreshold;
-	/** @var null|Position */
+	/** @var null|WeakPosition */
 	private $spawnPosition = null;
 
 	protected $inAirTicks = 0;
@@ -1038,7 +1039,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 		}else{
 			$level = $pos->getLevel();
 		}
-		$this->spawnPosition = new Position($pos->x, $pos->y, $pos->z, $level);
+		$this->spawnPosition = new WeakPosition($pos->x, $pos->y, $pos->z, $level);
 		$pk = new SetSpawnPositionPacket();
 		$pk->x = (int) $this->spawnPosition->x;
 		$pk->y = (int) $this->spawnPosition->y;
@@ -1678,7 +1679,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 		$this->dataPacket(new ResourcePacksInfoPacket());
 
 		if($this->spawnPosition === null and isset($this->namedtag->SpawnLevel) and ($level = $this->server->getLevelByName($this->namedtag["SpawnLevel"])) instanceof Level){
-			$this->spawnPosition = new Position($this->namedtag["SpawnX"], $this->namedtag["SpawnY"], $this->namedtag["SpawnZ"], $level);
+			$this->spawnPosition = new WeakPosition($this->namedtag["SpawnX"], $this->namedtag["SpawnY"], $this->namedtag["SpawnZ"], $level);
 		}
 
 		$spawnPosition = $this->getSpawn();
@@ -3081,7 +3082,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 		parent::saveNBT();
 		if($this->level instanceof Level){
 			$this->namedtag->Level = new StringTag("Level", $this->level->getName());
-			if($this->spawnPosition instanceof Position and $this->spawnPosition->getLevel() instanceof Level){
+			if($this->spawnPosition instanceof WeakPosition and $this->spawnPosition->isValid()){
 				$this->namedtag["SpawnLevel"] = $this->spawnPosition->getLevel()->getName();
 				$this->namedtag["SpawnX"] = (int) $this->spawnPosition->x;
 				$this->namedtag["SpawnY"] = (int) $this->spawnPosition->y;
diff --git a/src/pocketmine/level/Position.php b/src/pocketmine/level/Position.php
index d581ab0da..92e0d74fd 100644
--- a/src/pocketmine/level/Position.php
+++ b/src/pocketmine/level/Position.php
@@ -64,7 +64,7 @@ class Position extends Vector3{
 	 * @return bool
 	 */
 	public function isValid(){
-		return $this->level !== null;
+		return $this->getLevel() !== null;
 	}
 
 	/**
diff --git a/src/pocketmine/level/WeakPosition.php b/src/pocketmine/level/WeakPosition.php
new file mode 100644
index 000000000..99064bfe8
--- /dev/null
+++ b/src/pocketmine/level/WeakPosition.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\level;
+
+use pocketmine\math\Vector3;
+use pocketmine\Server;
+use pocketmine\utils\LevelException;
+
+class WeakPosition extends Position{
+
+	/**
+	 * @param int   $x
+	 * @param int   $y
+	 * @param int   $z
+	 * @param Level $level
+	 */
+	public function __construct($x = 0, $y = 0, $z = 0, Level $level = null){
+		$this->x = $x;
+		$this->y = $y;
+		$this->z = $z;
+		$this->levelId = ($level !== null ? $level->getId() : -1);
+	}
+
+	public static function fromObject(Vector3 $pos, Level $level = null){
+		return new WeakPosition($pos->x, $pos->y, $pos->z, $level);
+	}
+
+	/**
+	 * @return Level
+	 */
+	public function getLevel(){
+		return Server::getInstance()->getLevel($this->levelId);
+	}
+
+	public function setLevel(Level $level){
+		$this->levelId = ($level !== null ? $level->getId() : -1);
+		return $this;
+	}
+
+	/**
+	 * Returns a side Vector
+	 *
+	 * @param int $side
+	 * @param int $step
+	 *
+	 * @return WeakPosition
+	 *
+	 * @throws LevelException
+	 */
+	public function getSide($side, $step = 1){
+		assert($this->isValid());
+
+		return WeakPosition::fromObject(parent::getSide($side, $step), $this->level);
+	}
+
+	public function __toString(){
+		return "Weak" . parent::__toString();
+	}
+}
\ No newline at end of file