From be4d96fa22ae911fadd091977fd1f80e3da60ceb Mon Sep 17 00:00:00 2001
From: Max Klaversma <maxklaversma@gmail.com>
Date: Sat, 19 Apr 2014 22:05:18 +0200
Subject: [PATCH] Changed the maplist a bit and changed maps limit to avoid
 crash

---
 application/core/Maps/MapList.php    | 16 +++++++++++-----
 application/core/Maps/MapManager.php |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php
index 39b1b7f7..0ce663f1 100644
--- a/application/core/Maps/MapList.php
+++ b/application/core/Maps/MapList.php
@@ -199,6 +199,12 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 		/**
 		 * @var Map $map
 		 */
+		$currentMap = $this->maniaControl->mapManager->getCurrentMap();
+		$mxIcon = $this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON);
+		$mxIconHover = $this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON_MOVER);
+		$mxIconGreen = $this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON_GREEN);
+		$mxIconGreenHover = $this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON_GREEN_MOVER);
+
 		foreach($mapList as $map) {
 			if (!isset($pageFrame)) {
 				$pageFrame = new Frame();
@@ -225,7 +231,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				$lineQuad->setZ(0.001);
 			}
 
-			if ($this->maniaControl->mapManager->getCurrentMap() === $map) {
+			if ($currentMap === $map) {
 				$currentQuad = new Quad_Icons64x64_1();
 				$mapFrame->add($currentQuad);
 				$currentQuad->setX($x + 3.5);
@@ -241,8 +247,8 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				$mxQuad = new Quad();
 				$mapFrame->add($mxQuad);
 				$mxQuad->setSize(3, 3);
-				$mxQuad->setImage($this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON));
-				$mxQuad->setImageFocus($this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON_MOVER));
+				$mxQuad->setImage($mxIcon);
+				$mxQuad->setImageFocus($mxIconHover);
 				$mxQuad->setX($x + 65);
 				$mxQuad->setUrl($map->mx->pageurl);
 				$mxQuad->setZ(0.01);
@@ -252,8 +258,8 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 					$mxQuad = new Quad();
 					$mapFrame->add($mxQuad);
 					$mxQuad->setSize(3, 3);
-					$mxQuad->setImage($this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON_GREEN));
-					$mxQuad->setImageFocus($this->maniaControl->manialinkManager->iconManager->getIcon(IconManager::MX_ICON_GREEN_MOVER));
+					$mxQuad->setImage($mxIconGreen);
+					$mxQuad->setImageFocus($mxIconGreenHover);
 					$mxQuad->setX($x + 62);
 					$mxQuad->setUrl($map->mx->pageurl);
 					$mxQuad->setZ(0.01);
diff --git a/application/core/Maps/MapManager.php b/application/core/Maps/MapManager.php
index 8427e8e7..592a04e6 100644
--- a/application/core/Maps/MapManager.php
+++ b/application/core/Maps/MapManager.php
@@ -370,7 +370,7 @@ class MapManager implements CallbackListener {
 	 * Updates the full Map list, needed on Init, addMap and on ShuffleMaps
 	 */
 	private function updateFullMapList() {
-		$maps = $this->maniaControl->client->getMapList(1000, 0);
+		$maps = $this->maniaControl->client->getMapList(150, 0);
 		$tempList = array();
 		foreach ($maps as $rpcMap) {
 			if (array_key_exists($rpcMap->uId, $this->maps)) {