implemented force actions

core/Communication/CommunicationAnswer.php

@@ -22,5 +22,4 @@ class CommunicationAnswer {
 		$this->data  = $data;
 		$this->error = $error;
 	}
-
 }

core/Communication/CommunicationMethods.php

@@ -47,9 +47,18 @@ interface CommunicationMethods {
 	 */
 	const KICK_PLAYER = "PlayerActions.KickPlayer";
 
-	//TODO implement
+	/** Forces a player to Spectator
+	 *  Required Params
+	 *  - login
+	 */
 	const FORCE_PLAYER_TO_SPEC = "PlayerActions.ForcePlayerToSpec";
-	//TODO implement
+
+	/** Forces a player to Spectator
+	 *  Required Params
+	 *  - login
+	 *  Optional Params
+	 *  - teamId (id of the team the player shoudl get forced into it)
+	 */
 	const FORCE_PLAYER_TO_PLAY = "PlayerActions.ForcePlayerToPlay";
 
 	/** Returns the last 200 lines of the chat (inclusive player logins and nicknames)

core/Players/PlayerActions.php

@@ -121,6 +121,30 @@ class PlayerActions implements EchoListener, CommunicationListener {
 
 			return new CommunicationAnswer(array("success" => $success));
 		});
+
+		$this->maniaControl->getCommunicationManager()->registerCommunicationListener(CommunicationMethods::FORCE_PLAYER_TO_SPEC, $this, function ($data) {
+			if (!is_object($data) || !property_exists($data, "login")) {
+				return new CommunicationAnswer("You have to provide a valid player Login", true);
+			}
+			//TODO allow parameters like spectator state
+			$success = $this->forcePlayerToSpectator(null, $data->login, self::SPECTATOR_BUT_KEEP_SELECTABLE, true, false);
+			return new CommunicationAnswer(array("success" => $success));
+		});
+
+		$this->maniaControl->getCommunicationManager()->registerCommunicationListener(CommunicationMethods::FORCE_PLAYER_TO_PLAY, $this, function ($data) {
+			if (!is_object($data) || !property_exists($data, "login")) {
+				return new CommunicationAnswer("You have to provide a valid player Login", true);
+			}
+
+			//TODO allow parameters like spectator state
+			if (property_exists($data, "teamId")) {
+				$success = $this->forcePlayerToTeam(null, $data->login, $data->teamId, false);
+			} else {
+				$success = $this->forcePlayerToPlay(null, $data->login, true, true, false);
+			}
+
+			return new CommunicationAnswer(array("success" => $success));
+		});
 	}
 
 	/**
@@ -129,54 +153,79 @@ class PlayerActions implements EchoListener, CommunicationListener {
 	 * @param string $adminLogin
 	 * @param string $targetLogin
 	 * @param int    $teamId
+	 * @param bool   $calledByAdmin
+	 * @return bool
 	 */
-	public function forcePlayerToTeam($adminLogin, $targetLogin, $teamId) {
+	public function forcePlayerToTeam($adminLogin, $targetLogin, $teamId, $calledByAdmin = true) {
+		if ($calledByAdmin) {
 			$admin = $this->maniaControl->getPlayerManager()->getPlayer($adminLogin);
 			if (!$this->maniaControl->getAuthenticationManager()->checkPermission($admin, self::SETTING_PERMISSION_FORCE_PLAYER_TEAM)
 			) {
 				$this->maniaControl->getAuthenticationManager()->sendNotAllowed($admin);
-			return;
+				return false;
+			}
+			if (!$admin) {
+				return false;
+			}
 		}
 		$target = $this->maniaControl->getPlayerManager()->getPlayer($targetLogin);
-		if (!$target || !$admin) {
+		if (!$target) {
-			return;
+			return false;
 		}
 
 		if ($target->isSpectator) {
 			try {
-				if (!$this->forcePlayerToPlay($adminLogin, $targetLogin, true, false)) {
+				if (!$this->forcePlayerToPlay($adminLogin, $targetLogin, true, false, $calledByAdmin)) {
-					return;
+					return false;
 				}
 			} catch (FaultException $exception) {
+				if ($calledByAdmin) {
 					$this->maniaControl->getChat()->sendException($exception, $admin);
 				}
 			}
+		}
 
 		try {
 			$this->maniaControl->getClient()->forcePlayerTeam($target->login, $teamId);
 		} catch (ServerOptionsException $exception) {
 			$this->forcePlayerToPlay($adminLogin, $targetLogin);
-			return;
+			return false;
 		} catch (UnknownPlayerException $exception) {
+			if ($calledByAdmin) {
 				$this->maniaControl->getChat()->sendException($exception, $admin);
-			return;
+			}
+			return false;
 		} catch (GameModeException $exception) {
+			if ($calledByAdmin) {
 				$this->maniaControl->getChat()->sendException($exception, $admin);
-			return;
+			}
+			return false;
 		}
 
 		$chatMessage = false;
+
+		if ($calledByAdmin) {
 			$title = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
 			if ($teamId === self::TEAM_BLUE) {
 				$chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' forced ' . $target->getEscapedNickname() . ' into the Blue-Team!';
 			} else if ($teamId === self::TEAM_RED) {
 				$chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' forced ' . $target->getEscapedNickname() . ' into the Red-Team!';
 			}
+		} else {
+			if ($teamId === self::TEAM_BLUE) {
+				$chatMessage = $target->getEscapedNickname() . ' got forced into the Blue-Team!';
+			} else if ($teamId === self::TEAM_RED) {
+				$chatMessage = $target->getEscapedNickname() . ' got forced into the Red-Team!';
+			}
+		}
+
 		if (!$chatMessage) {
-			return;
+			return false;
 		}
 		$this->maniaControl->getChat()->sendInformation($chatMessage);
 		Logger::logInfo($chatMessage, true);
+
+		return true;
 	}
 
 	/**
@@ -186,15 +235,19 @@ class PlayerActions implements EchoListener, CommunicationListener {
 	 * @param string $targetLogin
 	 * @param bool   $userIsAbleToSelect
 	 * @param bool   $displayAnnouncement
+	 * @param bool   $calledByAdmin
 	 * @return bool
 	 */
-	public function forcePlayerToPlay($adminLogin, $targetLogin, $userIsAbleToSelect = true, $displayAnnouncement = true) {
+	public function forcePlayerToPlay($adminLogin, $targetLogin, $userIsAbleToSelect = true, $displayAnnouncement = true, $calledByAdmin = true) {
+		if ($calledByAdmin) {
 			$admin = $this->maniaControl->getPlayerManager()->getPlayer($adminLogin);
 			if (!$this->maniaControl->getAuthenticationManager()->checkPermission($admin, self::SETTING_PERMISSION_FORCE_PLAYER_PLAY)
 			) {
 				$this->maniaControl->getAuthenticationManager()->sendNotAllowed($admin);
 				return false;
 			}
+		}
+
 		$target = $this->maniaControl->getPlayerManager()->getPlayer($targetLogin);
 		if (!$target) {
 			return false;
@@ -203,7 +256,9 @@ class PlayerActions implements EchoListener, CommunicationListener {
 		try {
 			$this->maniaControl->getClient()->forceSpectator($target->login, self::SPECTATOR_PLAYER);
 		} catch (ServerOptionsException $exception) {
+			if ($calledByAdmin) {
 				$this->maniaControl->getChat()->sendException($exception, $admin);
+			}
 			return false;
 		}
 
@@ -211,14 +266,22 @@ class PlayerActions implements EchoListener, CommunicationListener {
 			try {
 				$this->maniaControl->getClient()->forceSpectator($target->login, self::SPECTATOR_USER_SELECTABLE);
 			} catch (ServerOptionsException $exception) {
+				if ($calledByAdmin) {
 					$this->maniaControl->getChat()->sendException($exception, $admin);
+				}
 				return false;
 			}
 		}
 
 		// Announce force
 		if ($displayAnnouncement) {
+			if ($calledByAdmin) {
 				$chatMessage = $admin->getEscapedNickname() . ' forced ' . $target->getEscapedNickname() . ' to Play!';
+			} else {
+				$chatMessage = $target->getEscapedNickname() . ' got forced to Play!';
+			}
+
+
 			$this->maniaControl->getChat()->sendInformation($chatMessage);
 		}
 
@@ -232,29 +295,44 @@ class PlayerActions implements EchoListener, CommunicationListener {
 	 * @param string $targetLogin
 	 * @param int    $spectatorState
 	 * @param bool   $releaseSlot
+	 * @param bool   $calledByAdmin
+	 * @return bool
 	 */
-	public function forcePlayerToSpectator($adminLogin, $targetLogin, $spectatorState = self::SPECTATOR_BUT_KEEP_SELECTABLE, $releaseSlot = true) {
+	public function forcePlayerToSpectator($adminLogin, $targetLogin, $spectatorState = self::SPECTATOR_BUT_KEEP_SELECTABLE, $releaseSlot = true, $calledByAdmin = true) {
+		if ($calledByAdmin) {
 			$admin = $this->maniaControl->getPlayerManager()->getPlayer($adminLogin);
 			if (!$this->maniaControl->getAuthenticationManager()->checkPermission($admin, self::SETTING_PERMISSION_FORCE_PLAYER_SPEC)
 			) {
 				$this->maniaControl->getAuthenticationManager()->sendNotAllowed($admin);
-			return;
+				return false;
 			}
+
+			if (!$admin) {
+				return false;
+			}
+		}
+
 		$target = $this->maniaControl->getPlayerManager()->getPlayer($targetLogin);
 
-		if (!$admin || !$target || $target->isSpectator) {
+		if (!$target || $target->isSpectator) {
-			return;
+			return false;
 		}
 
 		try {
 			$this->maniaControl->getClient()->forceSpectator($target->login, $spectatorState);
 		} catch (ServerOptionsException $exception) {
+			if ($calledByAdmin) {
 				$this->maniaControl->getChat()->sendException($exception, $admin->login);
-			return;
+			}
+			return false;
 		}
 
+		if ($calledByAdmin) {
 			$title       = $this->maniaControl->getAuthenticationManager()->getAuthLevelName($admin->authLevel);
 			$chatMessage = $title . ' ' . $admin->getEscapedNickname() . ' forced ' . $target->getEscapedNickname() . ' to Spectator!';
+		} else {
+			$chatMessage = $target->getEscapedNickname() . ' got forced to Spectator!';
+		}
 		$this->maniaControl->getChat()->sendInformation($chatMessage);
 		Logger::logInfo($chatMessage, true);
 
@@ -266,6 +344,8 @@ class PlayerActions implements EchoListener, CommunicationListener {
 			} catch (UnknownPlayerException $e) {
 			}
 		}
+
+		return true;
 	}
 
 	/**
@@ -667,4 +747,4 @@ class PlayerActions implements EchoListener, CommunicationListener {
 		}
 		return false;
 	}
-	}
+}