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

fix MatchRecover and AdminUI non-updated

Browse Source
This commit is contained in:
Beu
2026-01-28 12:18:53 +01:00
parent f3b121aaa9
commit 02c081ffaa
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MatchManagerSuite/MatchManagerCore.php
View File

@@ -43,7 +43,7 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
* MARK: Constants * MARK: Constants
*/ */
const PLUGIN_ID = 152; const PLUGIN_ID = 152;
const PLUGIN_VERSION = 6.1; const PLUGIN_VERSION = 6.2;
const PLUGIN_NAME = 'MatchManager Core'; const PLUGIN_NAME = 'MatchManager Core';
const PLUGIN_AUTHOR = 'Beu'; const PLUGIN_AUTHOR = 'Beu';
@@ -752,9 +752,7 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
public function resetMatchVariables() { public function resetMatchVariables() {
$this->log("Reset match variables"); $this->log("Reset match variables");
$this->matchStarted = false; $this->matchStarted = false;
$this->matchrecover = false;
$this->pauseon = false; $this->pauseon = false;
$this->pointstorecover = array();
$this->currentscore = array(); $this->currentscore = array();
$this->currentteamsscore = array(); $this->currentteamsscore = array();
$this->preendroundscore = null; $this->preendroundscore = null;
@@ -774,6 +772,10 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
$this->currentgmbase = ""; $this->currentgmbase = "";
$this->currentcustomgm = ""; $this->currentcustomgm = "";
$this->currentsettingmode = ""; $this->currentsettingmode = "";
// These values are not reset here because needed changed before the matchstart
//$this->matchrecover = false;
//$this->pointstorecover = array();
} }
/** /**
* Add items in AdminUI plugin * Add items in AdminUI plugin
@@ -1310,7 +1312,6 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
'mapshidden' => $this->mapshidden, 'mapshidden' => $this->mapshidden,
'maps' => $this->maps]; 'maps' => $this->maps];
$this->maniaControl->getCallbackManager()->triggerCallback(self::CB_MATCHMANAGER_STARTMATCH, $this->matchid, $settings); $this->maniaControl->getCallbackManager()->triggerCallback(self::CB_MATCHMANAGER_STARTMATCH, $this->matchid, $settings);
$this->updateAdminUIMenuItems();
$this->log("Skip map"); $this->log("Skip map");
$this->maniaControl->getMapManager()->getMapActions()->skipMap(); $this->maniaControl->getMapManager()->getMapActions()->skipMap();
@@ -1319,6 +1320,7 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
$this->logError("Can't start the match: ". $e->getMessage()); $this->logError("Can't start the match: ". $e->getMessage());
$this->maniaControl->getChat()->sendErrorToAdmins(self::CHAT_PREFIX . "Can't start the match: ". $e->getMessage()); $this->maniaControl->getChat()->sendErrorToAdmins(self::CHAT_PREFIX . "Can't start the match: ". $e->getMessage());
} }
$this->updateAdminUIMenuItems();
} }
/** /**
@@ -1407,12 +1409,14 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
$this->resetMatchVariables(); $this->resetMatchVariables();
$this->postmatch = true; $this->postmatch = true;
$this->matchrecover = false;
$this->pointstorecover = [];
$this->updateAdminUIMenuItems();
} catch (Exception $e) { } catch (Exception $e) {
$this->maniaControl->getChat()->sendErrorToAdmins(self::CHAT_PREFIX . "Can't finish the match: " . $e->getMessage()); $this->maniaControl->getChat()->sendErrorToAdmins(self::CHAT_PREFIX . "Can't finish the match: " . $e->getMessage());
$this->logError("Can't finish the match: ". $e->getMessage()); $this->logError("Can't finish the match: ". $e->getMessage());
} }
$this->updateAdminUIMenuItems();
} }
/** /**
@@ -1457,14 +1461,15 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
$this->resetMatchVariables(); $this->resetMatchVariables();
$this->postmatch = true; $this->postmatch = true;
$this->matchrecover = false;
$this->updateAdminUIMenuItems(); $this->pointstorecover = [];
} catch (Exception $e) { } catch (Exception $e) {
$this->maniaControl->getChat()->sendErrorToAdmins(self::CHAT_PREFIX . "Can't stop the match: " . $e->getMessage()); $this->maniaControl->getChat()->sendErrorToAdmins(self::CHAT_PREFIX . "Can't stop the match: " . $e->getMessage());
$this->logError("Can't stop the match: ". $e->getMessage()); $this->logError("Can't stop the match: ". $e->getMessage());
} }
$this->log("Restarting map to load Gamemode"); $this->log("Restarting map to load Gamemode");
$this->maniaControl->getClient()->restartMap(); $this->maniaControl->getClient()->restartMap();
$this->updateAdminUIMenuItems();
} }
/** /**
@@ -1528,7 +1533,6 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
$array[] = $row; $array[] = $row;
} }
if (isset($array[0])) { if (isset($array[0])) {
$this->matchrecover = true;
foreach ($array as $index => $value) { foreach ($array as $index => $value) {
if (isset($value['login'])) { if (isset($value['login'])) {
$this->pointstorecover[$value['login']] = $value['matchpoints']; $this->pointstorecover[$value['login']] = $value['matchpoints'];
@@ -1536,6 +1540,7 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
} }
$this->maniaControl->getChat()->sendSuccess(self::CHAT_PREFIX . 'Recovering the match: ' . $matchid); $this->maniaControl->getChat()->sendSuccess(self::CHAT_PREFIX . 'Recovering the match: ' . $matchid);
$this->log('Recovering the match: ' . $matchid); $this->log('Recovering the match: ' . $matchid);
$this->log('Points to recover: '. print_r($this->pointstorecover, true));
$this->MatchStart(); $this->MatchStart();
return true; return true;
} else { } else {
@@ -1555,6 +1560,7 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
* Function called to recover points * Function called to recover points
*/ */
private function recoverPoints() { private function recoverPoints() {
$this->log('Points to recover: '. print_r($this->pointstorecover, true));
if (!empty($this->pointstorecover)) { if (!empty($this->pointstorecover)) {
if ($this->currentgmbase == "Teams") { if ($this->currentgmbase == "Teams") {
// Blue Team // Blue Team