From 804d6695135f76d460529a8eb5c46ebdb981efb5 Mon Sep 17 00:00:00 2001 From: Cheese Date: Tue, 7 Jul 2015 10:44:24 +1000 Subject: [PATCH] return types --- .../game/components/world/WorldComponent.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php index e1d69501b..45a2601a9 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php @@ -11,6 +11,7 @@ namespace mineplex\plugin\gameengine\game\components\world; use mineplex\plugin\gameengine\arenas\Arena; use mineplex\plugin\gameengine\game\components\world\event\WorldLoadFailEvent; use mineplex\plugin\gameengine\game\components\world\event\WorldLoadSuccessEvent; +use mineplex\plugin\util\UtilArray; use mineplex\plugin\util\UtilString; use pocketmine\event\Listener; use pocketmine\level\Position; @@ -231,19 +232,33 @@ class WorldComponent implements Listener } } + /** + * @return Position[][] + */ public function getTeams() { return $this->mapTeams; } + /** + * @param $key + * @return int + */ public function getSetting($key) { return $this->mapSettings[$key]; } + /** + * @param $key + * @return Position[] + */ public function getData($key) { - return $this->mapData[$key]; + if (UtilArray::hasKey($key, $this->mapData)) + return $this->mapData[$key]; + + return []; } public function getPosition() @@ -251,7 +266,6 @@ class WorldComponent implements Listener return $this->getTeams()[0][0]; } - protected function strToPos($str) { if (strlen($str) < 5)