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

fixed forcespec exception

Browse Source
This commit is contained in:
kremsy 2014-04-13 12:25:39 +02:00 committed by Steffen Schröder
parent 9898009a82
commit 7ba4aa0b7b
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
application/core/Players/PlayerActions.php
View File

@ -16,9 +16,9 @@ use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
/** /**
* Player Actions Class * Player Actions Class
* *
* @author steeffeen & kremsy * @author steeffeen & kremsy
* @copyright ManiaControl Copyright © 2014 ManiaControl Team * @copyright ManiaControl Copyright © 2014 ManiaControl Team
* @license http://www.gnu.org/licenses/ GNU General Public License, Version 3 * @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
*/ */
class PlayerActions { class PlayerActions {
/* /*
@ -184,7 +184,17 @@ class PlayerActions {
return; return;
} }
$this->maniaControl->client->forceSpectator($target->login, $spectatorState);
try {
$this->maniaControl->client->forceSpectator($target->login, $spectatorState);
} catch(Exception $e) {
if ($e->getMessage() == "There are too many spectators") {
$this->maniaControl->chat->sendError($e->getMessage(), $adminLogin);
return;
}
throw $e;
}
$title = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel); $title = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
$chatMessage = $title . ' $<' . $admin->nickname . '$> forced $<' . $target->nickname . '$> to Spectator!'; $chatMessage = $title . ' $<' . $admin->nickname . '$> forced $<' . $target->nickname . '$> to Spectator!';
@ -197,12 +207,12 @@ class PlayerActions {
$this->maniaControl->client->spectatorReleasePlayerSlot($target->login); $this->maniaControl->client->spectatorReleasePlayerSlot($target->login);
} catch(Exception $e) { } catch(Exception $e) {
//if ($e->getMessage() == 'The player is not a spectator') { //if ($e->getMessage() == 'The player is not a spectator') {
//$this->kickPlayer($adminLogin, $targetLogin, 'Disconnect'); //$this->kickPlayer($adminLogin, $targetLogin, 'Disconnect');
//$this->maniaControl->errorHandler->triggerDebugNotice("inaktiv spec player kicked " . $e->getMessage()); //$this->maniaControl->errorHandler->triggerDebugNotice("inaktiv spec player kicked " . $e->getMessage());
//} else { //} else {
$this->maniaControl->errorHandler->triggerDebugNotice("PlayerActions Debug Line 183: " . $e->getMessage()); $this->maniaControl->errorHandler->triggerDebugNotice("PlayerActions Debug Line 183: " . $e->getMessage());
// TODO: only possible valid exception should be "wrong login" - throw others (like connection error) // TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
//do nothing //do nothing
//} //}
} }
} }
@ -371,7 +381,7 @@ class PlayerActions {
$this->maniaControl->client->kick($target->login, $message); $this->maniaControl->client->kick($target->login, $message);
} }
} catch(Exception $e) { } catch(Exception $e) {
if($e == "Login unknown."){ if ($e == "Login unknown.") {
return; return;
} }
// TODO: only possible valid exception should be "wrong login" - throw others (like connection error) // TODO: only possible valid exception should be "wrong login" - throw others (like connection error)