From abff932d8f374e7bab4ee85bad50230d7a413b02 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Sat, 24 May 2014 13:30:37 +0200
Subject: [PATCH] Moved Entity::get() to Level::getEntity() and removed
 Entity::getAll()

---
 src/pocketmine/entity/Entity.php |  8 --------
 src/pocketmine/level/Level.php   | 11 ++++++++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index e083abbe3..305bec9c0 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -118,14 +118,6 @@ abstract class Entity extends Position implements Metadatable{
 
 	public $closed;
 
-	public static function get($entityID){
-		return isset(Entity::$list[$entityID]) ? Entity::$list[$entityID] : false;
-	}
-
-	public static function getAll(){
-		return Entity::$list;
-	}
-
 
 	public function __construct(Level $level, Compound $nbt){
 		$this->id = Entity::$entityCount++;
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 8de5b0a49..852e8488a 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -67,7 +67,7 @@ class Level{
 	public $players = [];
 
 	/** @var Entity[] */
-	public $entities = [];
+	protected $entities = [];
 
 	/** @var Entity[][] */
 	public $chunkEntities = [];
@@ -798,6 +798,15 @@ class Level{
 		return $this->level->getBiome((int) $x, (int) $z, $biome);
 	}
 
+	/**
+	 * @param int $entityId
+	 *
+	 * @return Entity
+	 */
+	public function getEntity($entityId){
+		return isset($this->entities[$entityId]) ? $this->entities[$entityId] : null;
+	}
+
 	/**
 	 * Gets the list of all the entitites in this level
 	 *