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

fixed exceptions

Browse Source
This commit is contained in:
Steffen Schröder 2014-08-03 13:06:43 +02:00
parent d517c2d561
commit 28cfee646a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/core/Maps/MapList.php
View File

@ -24,6 +24,7 @@ use ManiaControl\Players\Player;
use ManiaControl\Utils\ColorUtil; use ManiaControl\Utils\ColorUtil;
use ManiaControl\Utils\Formatter; use ManiaControl\Utils\Formatter;
use Maniaplanet\DedicatedServer\Xmlrpc\ChangeInProgressException; use Maniaplanet\DedicatedServer\Xmlrpc\ChangeInProgressException;
use Maniaplanet\DedicatedServer\Xmlrpc\FileException;
use Maniaplanet\DedicatedServer\Xmlrpc\NextMapException; use Maniaplanet\DedicatedServer\Xmlrpc\NextMapException;
use Maniaplanet\DedicatedServer\Xmlrpc\NotInListException; use Maniaplanet\DedicatedServer\Xmlrpc\NotInListException;
use MCTeam\CustomVotesPlugin; use MCTeam\CustomVotesPlugin;
@ -629,7 +630,11 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$this->showMapList($player); $this->showMapList($player);
break; break;
case self::ACTION_REMOVE_MAP: case self::ACTION_REMOVE_MAP:
$this->maniaControl->getMapManager()->removeMap($player, $mapUid); try {
$this->maniaControl->getMapManager()->removeMap($player, $mapUid);
} catch (FileException $e) {
$this->maniaControl->getChat()->sendException($e, $player);
}
break; break;
case self::ACTION_SWITCH_MAP: case self::ACTION_SWITCH_MAP:
// Don't queue on Map-Change // Don't queue on Map-Change

6
application/core/Maps/MapQueue.php
View File

@ -10,6 +10,7 @@ use ManiaControl\ManiaControl;
use ManiaControl\Players\Player; use ManiaControl\Players\Player;
use ManiaControl\Utils\Formatter; use ManiaControl\Utils\Formatter;
use Maniaplanet\DedicatedServer\Xmlrpc\NextMapException; use Maniaplanet\DedicatedServer\Xmlrpc\NextMapException;
use Maniaplanet\DedicatedServer\Xmlrpc\NotInListException;
/** /**
* ManiaControl Map Queue Class * ManiaControl Map Queue Class
@ -334,7 +335,7 @@ class MapQueue implements CallbackListener, CommandListener {
break; break;
} }
//found player, so play this map // Player found, so play this map
if ($this->maniaControl->getPlayerManager()->getPlayer($player->login)) { if ($this->maniaControl->getPlayerManager()->getPlayer($player->login)) {
break; break;
} }
@ -349,7 +350,7 @@ class MapQueue implements CallbackListener, CommandListener {
// Trigger callback // Trigger callback
$this->maniaControl->getCallbackManager()->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('skip', $queuedMap[0])); $this->maniaControl->getCallbackManager()->triggerCallback(self::CB_MAPQUEUE_CHANGED, array('skip', $queuedMap[0]));
//Player not found, so remove the map from the mapqueue // Player not found, so remove the map from the mapqueue
array_shift($this->queuedMaps); array_shift($this->queuedMaps);
$this->maniaControl->getChat()->sendInformation('$fa0$<$fff' . $queuedMap[0]->name . '$> is skipped because $<' . $player->nickname . '$> left the game!'); $this->maniaControl->getChat()->sendInformation('$fa0$<$fff' . $queuedMap[0]->name . '$> is skipped because $<' . $player->nickname . '$> left the game!');
@ -369,6 +370,7 @@ class MapQueue implements CallbackListener, CommandListener {
try { try {
$this->maniaControl->getClient()->setNextMapIdent($map->uid); $this->maniaControl->getClient()->setNextMapIdent($map->uid);
} catch (NextMapException $e) { } catch (NextMapException $e) {
} catch (NotInListException $e) {
} }
} }