beu/TrackManiaControl
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

added unkown command to gamemodeexception

Browse Source
This commit is contained in:
kremsy
2020-03-28 18:08:05 +01:00
parent 68edd009fc
commit ed250af546
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/Server/Commands.php
View File

@@ -226,7 +226,7 @@ class Commands implements CallbackListener, CommandListener, ManialinkPageAnswer
try { try {
$this->maniaControl->getClient()->sendModeScriptCommands(array('Command_ForceWarmUp' => true)); $this->maniaControl->getClient()->sendModeScriptCommands(array('Command_ForceWarmUp' => true));
$this->maniaControl->getChat()->sendInformation($player->getEscapedNickname() . ' paused the Game!'); $this->maniaControl->getChat()->sendInformation($player->getEscapedNickname() . ' paused the Game!');
} catch (GameModeException | FaultException $e) { } catch (GameModeException $e) {
} }
try { try {
@@ -242,7 +242,6 @@ class Commands implements CallbackListener, CommandListener, ManialinkPageAnswer
//TODO verify if not everything is replaced through the new pause //TODO verify if not everything is replaced through the new pause
$this->maniaControl->getModeScriptEventManager()->startPause(); $this->maniaControl->getModeScriptEventManager()->startPause();
$this->maniaControl->getChat()->sendInformation('$f8fVote to $fffpause the current Game$f8f has been successful!'); $this->maniaControl->getChat()->sendInformation('$f8fVote to $fffpause the current Game$f8f has been successful!');
} }
/** /**

3
libs/Maniaplanet/DedicatedServer/Xmlrpc/FaultException.php
View File

@@ -96,6 +96,9 @@ class FaultException extends Exception {
case 'No map to export in playlist.': case 'No map to export in playlist.':
return new FileException($faultString, $faultCode); return new FileException($faultString, $faultCode);
} }
if (preg_match('~^Unknown command \'.*\'\.$~iu', $faultString)) {
return new GameModeException($faultString, $faultCode);
}
if (preg_match('~^Unknown setting \'.*\'\.$~iu', $faultString)) { if (preg_match('~^Unknown setting \'.*\'\.$~iu', $faultString)) {
return new GameModeException($faultString, $faultCode); return new GameModeException($faultString, $faultCode);
} }

2
plugins/MCTeam/CustomVotesPlugin.php
View File

@@ -525,7 +525,7 @@ class CustomVotesPlugin implements SidebarMenuEntryListener, CommandListener, Ca
//Gamemodes like Elite, Speedball //Gamemodes like Elite, Speedball
$this->maniaControl->getClient()->sendModeScriptCommands(array('Command_ForceWarmUp' => true)); $this->maniaControl->getClient()->sendModeScriptCommands(array('Command_ForceWarmUp' => true));
$this->maniaControl->getChat()->sendInformation('$f8fVote to $fffpause the current Game$f8f has been successful!'); $this->maniaControl->getChat()->sendInformation('$f8fVote to $fffpause the current Game$f8f has been successful!');
} catch (GameModeException | FaultException $ex) { } catch (GameModeException $ex) {
} }
//TODO verify if not everything is replaced through the new pause //TODO verify if not everything is replaced through the new pause