beu/ManiacontrolPlugins
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Compare commits

base: beu:9efa66ac5d33fb9e76a51c513b152cb6abfe7bda
Branches Tags
beu:master
...
compare: beu:0352d96fdf024266cd028da6ce3a33194f9327ba
Branches Tags
beu:master

2 Commits
9efa66ac5d ... 0352d96fdf

Author SHA1 Message Date
beu
0352d96fdf fix match score saving after an error when launching 2025-06-22 17:57:07 +02:00
beu
ebecb7da73 improve logging 2025-06-22 17:54:17 +02:00
1 changed files with 26 additions and 19 deletions
Expand all files Collapse all files

45
MatchManagerSuite/MatchManagerCore.php
View File

@ -715,19 +715,20 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
*/
public function resetMatchVariables() {
$this->log("Reset match variables");
$this->matchStarted = false;
$this->matchrecover = false;
$this->pauseon = false;
$this->pointstorecover = array();
$this->currentscore = array();
$this->preendroundscore = null;
$this->settingsloaded = false;
$this->mapsshuffled = false;
$this->mapshidden = false;
$this->hidenextmaps = false;
$this->maps = array();
$this->postmatch = true;
$this->matchid = "";
$this->matchStarted = false;
$this->matchrecover = false;
$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 = false;
$this->matchid = "";
$this->settings_nbroundsbymap = -1;
$this->settings_nbwinners = 2;
@ -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) {
$this->maniaControl->getClient()->removeMap($map->fileName);
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());