From 4704b8a179026a34eb3f537ab31c2fa762ebed2a Mon Sep 17 00:00:00 2001
From: kremsy <lukas@esc-clan.net>
Date: Thu, 27 Feb 2014 13:24:55 +0100
Subject: [PATCH] bugfix

---
 application/core/Players/PlayerActions.php | 30 ++++++++++------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/application/core/Players/PlayerActions.php b/application/core/Players/PlayerActions.php
index 5aec7ab1..2311522e 100644
--- a/application/core/Players/PlayerActions.php
+++ b/application/core/Players/PlayerActions.php
@@ -122,7 +122,7 @@ class PlayerActions {
 			return;
 		}
 		$target = $this->maniaControl->playerManager->getPlayer($targetLogin);
-		if(!$target) {
+		if(!$target || !$admin) {
 			return;
 		}
 
@@ -130,13 +130,7 @@ class PlayerActions {
 			$this->forcePlayerToPlay($adminLogin, $targetLogin, true, false);
 		}
 
-		try {
 			$this->maniaControl->client->forcePlayerTeam($target->login, $teamId);
-		} catch(Exception $e) {
-			// TODO: only possible valid exceptions should be "wrong login" or "not in team mode" - throw others (like connection error)
-			$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $admin->login);
-			return;
-		}
 
 		$chatMessage = false;
 		$title       = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
@@ -168,14 +162,12 @@ class PlayerActions {
 		}
 		$target = $this->maniaControl->playerManager->getPlayer($targetLogin);
 
-		try {
-			$this->maniaControl->client->forceSpectator($target->login, $spectatorState);
-		} catch(Exception $e) {
-			// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
-			$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $admin->login);
+		if(!$admin || !$target){
 			return;
 		}
 
+			$this->maniaControl->client->forceSpectator($target->login, $spectatorState);
+
 		$title       = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
 		$chatMessage = $title . ' $<' . $admin->nickname . '$> forced $<' . $target->nickname . '$> to Spectator!';
 		$this->maniaControl->chat->sendInformation($chatMessage);
@@ -208,14 +200,12 @@ class PlayerActions {
 
 		$target = $this->maniaControl->playerManager->getPlayer($targetLogin);
 
-		try {
-			$this->maniaControl->client->unIgnore($targetLogin);
-		} catch(Exception $e) {
-			// TODO: only possible valid exception should be "wrong login" - throw others (like connection error)
-			$this->maniaControl->chat->sendError('Error occurred: ' . $e->getMessage(), $adminLogin);
+		if(!$target){
 			return;
 		}
 
+			$this->maniaControl->client->unIgnore($targetLogin);
+
 		$title       = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
 		$chatMessage = $title . ' $<' . $admin->nickname . '$> un-muted $<' . $target->nickname . '$>!';
 		$this->maniaControl->chat->sendInformation($chatMessage);
@@ -238,6 +228,10 @@ class PlayerActions {
 
 		$target = $this->maniaControl->playerManager->getPlayer($targetLogin);
 
+		if(!$target){
+			return;
+		}
+
 		$this->maniaControl->client->ignore($targetLogin);
 
 		$title       = $this->maniaControl->authenticationManager->getAuthLevelName($admin->authLevel);
@@ -258,7 +252,9 @@ class PlayerActions {
 			$this->maniaControl->authenticationManager->sendNotAllowed($admin);
 			return;
 		}
+
 		$target = $this->maniaControl->playerManager->getPlayer($targetLogin);
+
 		if(!$target) {
 			return;
 		}