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

exception handling improvements

Browse Source
This commit is contained in:
kremsy
2014-01-31 21:55:30 +01:00
committed by Steffen Schröder
parent 3e06870f12
commit d701daeed7
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
application/core/Maps/MapCommands.php
View File

@@ -104,9 +104,15 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
$map = $nextQueued[1]; $map = $nextQueued[1];
$this->maniaControl->chat->sendInformation("Next map is $<" . $map->name . "$> from $<" . $map->authorNick . "$> requested by $<" . $requester->nickname . "$>.", $player->login); $this->maniaControl->chat->sendInformation("Next map is $<" . $map->name . "$> from $<" . $map->authorNick . "$> requested by $<" . $requester->nickname . "$>.", $player->login);
} else { } else {
$mapIndex = $this->maniaControl->client->getNextMapIndex(); try {
$maps = $this->maniaControl->mapManager->getMaps(); $mapIndex = $this->maniaControl->client->getNextMapIndex();
$map = $maps[$mapIndex]; } catch(\Exception $e) {
trigger_error("Error while Reading the next Map Index");
$this->maniaControl->chat->sendError("Error while Reading next Map Inde");
return;
}
$maps = $this->maniaControl->mapManager->getMaps();
$map = $maps[$mapIndex];
$this->maniaControl->chat->sendInformation("Next map is $<" . $map->name . "$> from $<" . $map->authorNick . "$>.", $player->login); $this->maniaControl->chat->sendInformation("Next map is $<" . $map->name . "$> from $<" . $map->authorNick . "$>.", $player->login);
} }
} }
@@ -181,10 +187,17 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
$this->maniaControl->authenticationManager->sendNotAllowed($player); $this->maniaControl->authenticationManager->sendNotAllowed($player);
return; return;
} }
try {
$this->maniaControl->client->nextMap();
} catch(\Exception $e) {
$this->maniaControl->chat->sendError("Error while Skipping the Map");
return;
}
$message = '$<' . $player->nickname . '$> skipped the current Map!'; $message = '$<' . $player->nickname . '$> skipped the current Map!';
$this->maniaControl->chat->sendSuccess($message); $this->maniaControl->chat->sendSuccess($message);
$this->maniaControl->log($message, true); $this->maniaControl->log($message, true);
$this->maniaControl->client->nextMap();
} }
/** /**
@@ -201,7 +214,11 @@ class MapCommands implements CommandListener, ManialinkPageAnswerListener, Callb
$message = '$<' . $player->nickname . '$> restarted the current Map!'; $message = '$<' . $player->nickname . '$> restarted the current Map!';
$this->maniaControl->chat->sendSuccess($message); $this->maniaControl->chat->sendSuccess($message);
$this->maniaControl->log($message, true); $this->maniaControl->log($message, true);
$this->maniaControl->client->restartMap(); try {
$this->maniaControl->client->restartMap();
} catch(\Exception $e) {
//do nothing
}
} }
/** /**