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

load score if possible when enabled after the match start + minor fixes

Browse Source
This commit is contained in:
Beu
2022-03-29 22:05:51 +02:00
parent ca343567f2
commit 0b8dbfbb8b
2 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
MatchManagerSuite/MatchManagerCore.php
View File

@ -27,7 +27,6 @@ use ManiaControl\Configurator\GameModeSettings;
use ManiaControl\Utils\Formatter;
use Maniaplanet\DedicatedServer\InvalidArgumentException;
use ManiaControl\Callbacks\TimerListener; // for pause
use ManiaControl\Maps\Map;
/**
* MatchManager Core
@ -324,7 +323,6 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
private $chatprefix = '$<$fc3$w🏆$m$> '; // Would like to create a setting but MC database doesn't support utf8mb4
private $nbmaps = 0;
private $nbrounds = 0;
private $nbspectators = 0;
private $currentgmbase = "";
private $currentcustomgm = "";
private $currentsettingmode = "";
@ -334,17 +332,13 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
// Settings to keep in memory
private $settings_nbroundsbymap = 5;
private $settings_nbwinner = 2;
private $settings_nbwinners = 2;
private $settings_nbmapsbymatch = 0;
private $settings_pointlimit = 100;
private $nbwinners = 0;
private $scriptSettings = array();
private $currentscore = array();
private $preendroundscore = array();
private $currentteamsscore = array();
private $playerpause = array();
private $pausetimer = 0;
private $pauseon = false;
@ -559,6 +553,10 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
return $this->matchStarted;
}
public function getCurrentGamemodeBase() {
return $this->currentgmbase;
}
public function getCountRound() {
return $this->nbrounds . "/" . $this->settings_nbroundsbymap;
}
@ -852,6 +850,10 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
* Function called to start the match
*/
public function MatchStart() {
if ($this->matchStarted) {
$this->maniaControl->getChat()->sendErrorToAdmins($this->chatprefix . " a match is already launched");
return;
}
try {
$this->matchid = $this->maniaControl->getServer()->login . "-" . time();
$this->currentgmbase = $this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_MATCH_GAMEMODE_BASE);
@ -1027,7 +1029,10 @@ class MatchManagerCore implements CallbackListener, CommandListener, TimerListen
*/
public function MatchStop() {
Logger::log("Match stop");
if (!$this->matchStarted) {
$this->maniaControl->getChat()->sendErrorToAdmins($this->chatprefix . " No match launched");
return;
}
try {
// Trigger Callback