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

exception fix

Browse Source
This commit is contained in:
kremsy 2014-04-21 23:14:06 +02:00 committed by Steffen Schröder
parent c0255bd442
commit 843467072d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/core/Libs/Maniaplanet/DedicatedServer/Xmlrpc/FaultException.php
View File

@ -24,9 +24,12 @@ class FaultException extends Exception
case 'Change in progress.': case 'Change in progress.':
return new ChangeInProgressException($faultString, $faultCode); return new ChangeInProgressException($faultString, $faultCode);
case 'The player is not a spectator': case 'The player is not a spectator':
case 'The player is not a spectator.':
return new PlayerIsNotSpectatorException($faultString, $faultCode); return new PlayerIsNotSpectatorException($faultString, $faultCode);
case 'Not in Team mode.': case 'Not in Team mode.':
return new NotInTeamModeException($faultString, $faultCode); return new NotInTeamModeException($faultString, $faultCode);
case 'The map isn\'t in the current selection.':
return new MapNotInCurrentSelectionException($faultString, $faultCode);
} }
return new self($faultString, $faultCode); return new self($faultString, $faultCode);
@ -40,4 +43,6 @@ class NotInScriptModeException extends FaultException {}
class ChangeInProgressException extends FaultException {} class ChangeInProgressException extends FaultException {}
class PlayerIsNotSpectatorException extends FaultException {} class PlayerIsNotSpectatorException extends FaultException {}
class NotInTeamModeException extends FaultException {} class NotInTeamModeException extends FaultException {}
class MapNotInCurrentSelectionException extends FaultException{}
?> ?>

1
application/core/ManiaControl.php
View File

@ -23,7 +23,6 @@ use ManiaControl\Settings\SettingManager;
use ManiaControl\Statistics\StatisticManager; use ManiaControl\Statistics\StatisticManager;
use ManiaControl\Update\UpdateManager; use ManiaControl\Update\UpdateManager;
use Maniaplanet\DedicatedServer\Connection; use Maniaplanet\DedicatedServer\Connection;
use Maniaplanet\DedicatedServer\Transport\TransportException;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception; use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
use Maniaplanet\DedicatedServer\Xmlrpc\NotInScriptModeException; use Maniaplanet\DedicatedServer\Xmlrpc\NotInScriptModeException;

5
application/core/Maps/MapManager.php
View File

@ -14,6 +14,7 @@ use ManiaControl\Players\Player;
use Maniaplanet\DedicatedServer\InvalidArgumentException; use Maniaplanet\DedicatedServer\InvalidArgumentException;
use Maniaplanet\DedicatedServer\Xmlrpc\CouldNotWritePlaylistFileException; use Maniaplanet\DedicatedServer\Xmlrpc\CouldNotWritePlaylistFileException;
use Maniaplanet\DedicatedServer\Xmlrpc\Exception; use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
use Maniaplanet\DedicatedServer\Xmlrpc\MapNotInCurrentSelectionException;
use Maniaplanet\DedicatedServer\Xmlrpc\StartIndexOutOfBoundException; use Maniaplanet\DedicatedServer\Xmlrpc\StartIndexOutOfBoundException;
/** /**
@ -238,7 +239,11 @@ class MapManager implements CallbackListener {
} }
// Remove map // Remove map
try{
$this->maniaControl->client->removeMap($map->fileName); $this->maniaControl->client->removeMap($map->fileName);
}catch(MapNotInCurrentSelectionException $e){
}
if ($eraseFile) { if ($eraseFile) {
// Check if ManiaControl can even write to the maps dir // Check if ManiaControl can even write to the maps dir