From 9b965a172058938553defbac553a930b2bee74de Mon Sep 17 00:00:00 2001
From: Max Klaversma <maxklaversma@gmail.com>
Date: Tue, 29 Apr 2014 22:30:29 +0200
Subject: [PATCH] MapList fixed

---
 application/core/Maps/MapList.php           | 11 ++++----
 application/plugins/Dedimania/Dedimania.php | 29 ---------------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/application/core/Maps/MapList.php b/application/core/Maps/MapList.php
index 4c87c1e4..8c5505d3 100644
--- a/application/core/Maps/MapList.php
+++ b/application/core/Maps/MapList.php
@@ -134,9 +134,10 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 			$mapList = array_slice($completeList, $chunk * self::MAX_PAGES_PER_CHUNK * self::MAX_MAPS_PER_PAGE, self::MAX_PAGES_PER_CHUNK * self::MAX_MAPS_PER_PAGE);
 			$pageCount = ceil(count($completeList) / self::MAX_MAPS_PER_PAGE);
 		}
-		else if ($maps !== 'redirect') {
+		else {
 			$mapList = $this->maniaControl->mapManager->getMaps($chunk * self::MAX_PAGES_PER_CHUNK * self::MAX_MAPS_PER_PAGE, self::MAX_PAGES_PER_CHUNK * self::MAX_MAPS_PER_PAGE);
 			$pageCount = ceil($this->maniaControl->mapManager->getMapsCount() / self::MAX_MAPS_PER_PAGE);
+			$this->mapsInListShown[$player->login] = $this->maniaControl->mapManager->getMaps();
 		}
 		
 		// Create ManiaLink
@@ -144,7 +145,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 		$script = $maniaLink->getScript();
 		$paging = new Paging();
 		$script->addFeature($paging);
-		if (is_int($pageCount)) $paging->setCustomMaxPageNumber($pageCount);
+		/*if (is_int($pageCount))*/ $paging->setCustomMaxPageNumber($pageCount);
 		$paging->setChunkActionAppendsPageNumber(true);
 		$paging->setChunkActions(self::ACTION_PAGING_CHUNKS);
 		
@@ -646,11 +647,11 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 				break;
 			case self::ACTION_QUEUED_MAP:
 				$this->maniaControl->mapManager->mapQueue->addMapToMapQueue($callback[1][1], $actionArray[2]);
-				$this->showMapList($player, 'redirect');
+				$this->showMapList($player);
 				break;
 			case self::ACTION_UNQUEUE_MAP:
 				$this->maniaControl->mapManager->mapQueue->removeFromMapQueue($player, $actionArray[2]);
-				$this->showMapList($player, 'redirect');
+				$this->showMapList($player);
 				break;
 			default:
 				if (substr($actionId, 0, strlen(self::ACTION_PAGING_CHUNKS)) === self::ACTION_PAGING_CHUNKS) {
@@ -688,7 +689,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
 			if ($shown) {
 				$player = $this->maniaControl->playerManager->getPlayer($login);
 				if ($player) {
-					$this->showMapList($player, 'redirect');
+					$this->showMapList($player);
 				}
 				else {
 					unset($this->mapListShown[$login]);
diff --git a/application/plugins/Dedimania/Dedimania.php b/application/plugins/Dedimania/Dedimania.php
index bd41ea52..5c8c34e3 100644
--- a/application/plugins/Dedimania/Dedimania.php
+++ b/application/plugins/Dedimania/Dedimania.php
@@ -200,9 +200,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
 	 * @param \ManiaControl\Players\Player $player
 	 */
 	public function handlePlayerConnect(Player $player) {
-		if (!$this->init) {
-			return;
-		}
 		// Send Dedimania request
 		$data    = array($this->dedimaniaData->sessionId, $player->login, $player->rawNickname, $player->path, $player->isSpectator);
 		$content = $this->encode_request(self::DEDIMANIA_PLAYERCONNECT, $data);
@@ -248,9 +245,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
 	 * @param \ManiaControl\Players\Player $player
 	 */
 	public function handlePlayerDisconnect(Player $player) {
-		if (!$this->init) {
-			return;
-		}
 		$this->dedimaniaData->removePlayer($player->login);
 
 		// Send Dedimania request
@@ -286,9 +280,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
 	 * @param $callback
 	 */
 	public function handleBeginMap($callback) {
-		if (!$this->init) {
-			return;
-		}
 		unset($this->dedimaniaData->records);
 		$this->fetchDedimaniaRecords(true);
 	}
@@ -300,9 +291,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
 	 * @param $callback
 	 */
 	public function handleMapEnd($callback) {
-		if (!$this->init) {
-			return;
-		}
 		if (!$this->dedimaniaData || !$this->dedimaniaData->records) {
 			return;
 		}
@@ -381,9 +369,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
 	 * @param $callback
 	 */
 	public function updatePlayerList($callback) {
-		if (!$this->init) {
-			return;
-		}
 		$serverInfo = $this->getServerInfo();
 		$playerList = $this->getPlayerList();
 		$votesInfo  = $this->getVotesInfo();
@@ -424,9 +409,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
 	 * @param $callback
 	 */
 	public function handlePlayerCheckpoint($callback) {
-		if (!$this->init) {
-			return;
-		}
 		$data  = $callback[1];
 		$login = $data[1];
 		$time  = $data[2];
@@ -444,9 +426,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
 	 * @param $callback
 	 */
 	public function handlePlayerFinished($callback) {
-		if (!$this->init) {
-			return;
-		}
 		//var_dump($callback);
 		$data = $callback[1];
 		if ($data[0] <= 0 || $data[2] <= 0) {
@@ -619,10 +598,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
 			return false;
 		}
 
-		if (!$this->init) {
-			return;
-		}
-
 		// Reset records
 		if ($reset) {
 			$this->dedimaniaData->records = array();
@@ -948,10 +923,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
 	 * @return array|RecordData
 	 */
 	public function getDedimaniaRecords() {
-		if (!$this->init) {
-			return false;
-		}
-
 		if (!$this->dedimaniaData->records) {
 			return null;
 		}