fix match score saving after an error when launching

MatchManagerSuite/MatchManagerCore.php

@@ -720,13 +720,14 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
 		$this->pauseon			 = false;
 		$this->pointstorecover	 = array();
 		$this->currentscore		 = array();
+		$this->currentteamsscore = array();
 		$this->preendroundscore	 = null;
 		$this->settingsloaded	 = false;
 		$this->mapsshuffled		 = false;
 		$this->mapshidden		 = false;
 		$this->hidenextmaps		 = false;
 		$this->maps				 = array();
-		$this->postmatch		= true;
+		$this->postmatch		 = false;
 		$this->matchid			 = "";
 
 		$this->settings_nbroundsbymap	= -1;
@@ -1138,6 +1139,8 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
 		if (!$this->canStartMatch()) return;
 
 		try {
+			$this->resetMatchVariables();
+
 			$this->matchid = $this->maniaControl->getServer()->login . "-" . time();
 			$this->currentgmbase = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MATCH_GAMEMODE_BASE);
 			$this->currentcustomgm = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MATCH_CUSTOM_GAMEMODE);
@@ -1156,7 +1159,7 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
 					try {
 						$mapInfo = $this->maniaControl->getMapManager()->initializeMap($this->maniaControl->getClient()->getMapInfo($map));
 					} catch (Exception $e) {
-						throw new \Exception("Error with the map " . $map . ": " . $e->getMessage());
+						throw new \Exception('Error with the Map to play "' . $map . '": ' . $e->getMessage());
 					}
 				}
 
@@ -1172,7 +1175,11 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
 
 				// Remove all maps
 				foreach ($this->maniaControl->getMapManager()->getMaps() as $map) {
+					try {
 						$this->maniaControl->getClient()->removeMap($map->fileName);
+					} catch (Exception $e) {
+						throw new \Exception('Error when removing map "' . $map->getEscapedName() . '" from the playlist: ' . $e->getMessage());
+					}
 				}
 
 				$this->maps = $maps;
@@ -1359,11 +1366,9 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
 			$this->log("Match finished");
 
 			$this->resetMatchVariables();
+			$this->postmatch = true;
+
 			$this->updateAdminUIMenuItems();
-
-			// Teams Specifics variables
-			$this->currentteamsscore = [];
-
 		} catch (Exception $e) {
 			$this->maniaControl->getChat()->sendErrorToAdmins($this->chatprefix . "Can't finish the match: " . $e->getMessage());
 			$this->logError("Can't finish the match: ". $e->getMessage());
@@ -1411,6 +1416,8 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
 			}
 
 			$this->resetMatchVariables();
+			$this->postmatch = true;
+
 			$this->updateAdminUIMenuItems();
 		} catch (Exception $e) {
 			$this->maniaControl->getChat()->sendErrorToAdmins($this->chatprefix . "Can't stop the match: " . $e->getMessage());