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

prevent force message if not successful

Browse Source
This commit is contained in:
Steffen Schröder 2014-06-22 16:13:19 +02:00
parent a9c509c8e9
commit d880c1995c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,8 +89,8 @@ class PlayerActions {
return; return;
} }
if ($target->isSpectator) { if ($target->isSpectator && !$this->forcePlayerToPlay($adminLogin, $targetLogin, true, false)) {
$this->forcePlayerToPlay($adminLogin, $targetLogin, true, false); return;
} }
try { try {
@ -121,17 +121,17 @@ class PlayerActions {
* @param string $targetLogin * @param string $targetLogin
* @param bool $userIsAbleToSelect * @param bool $userIsAbleToSelect
* @param bool $displayAnnouncement * @param bool $displayAnnouncement
* @internal param int $type * @return bool
*/ */
public function forcePlayerToPlay($adminLogin, $targetLogin, $userIsAbleToSelect = true, $displayAnnouncement = true) { public function forcePlayerToPlay($adminLogin, $targetLogin, $userIsAbleToSelect = true, $displayAnnouncement = true) {
$admin = $this->maniaControl->playerManager->getPlayer($adminLogin); $admin = $this->maniaControl->playerManager->getPlayer($adminLogin);
if (!$this->maniaControl->authenticationManager->checkPermission($admin, self::SETTING_PERMISSION_FORCE_PLAYER_PLAY)) { if (!$this->maniaControl->authenticationManager->checkPermission($admin, self::SETTING_PERMISSION_FORCE_PLAYER_PLAY)) {
$this->maniaControl->authenticationManager->sendNotAllowed($admin); $this->maniaControl->authenticationManager->sendNotAllowed($admin);
return; return false;
} }
$target = $this->maniaControl->playerManager->getPlayer($targetLogin); $target = $this->maniaControl->playerManager->getPlayer($targetLogin);
if (!$target) { if (!$target) {
return; return false;
} }
try { try {
@ -139,7 +139,7 @@ class PlayerActions {
} catch (FaultException $e) { } catch (FaultException $e) {
//TODO exception 'There are too many players' appeared 28.04.2014, wait for more before add to fault exception //TODO exception 'There are too many players' appeared 28.04.2014, wait for more before add to fault exception
$this->maniaControl->chat->sendException($e, $admin); $this->maniaControl->chat->sendException($e, $admin);
return; return false;
} }
if ($userIsAbleToSelect) { if ($userIsAbleToSelect) {
@ -156,6 +156,8 @@ class PlayerActions {
$chatMessage = '$<' . $admin->nickname . '$> forced $<' . $target->nickname . '$> to Play!'; $chatMessage = '$<' . $admin->nickname . '$> forced $<' . $target->nickname . '$> to Play!';
$this->maniaControl->chat->sendInformation($chatMessage); $this->maniaControl->chat->sendInformation($chatMessage);
} }
return true;
} }
/** /**
@ -166,7 +168,8 @@ class PlayerActions {
* @param int $spectatorState * @param int $spectatorState
* @param bool $releaseSlot * @param bool $releaseSlot
*/ */
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) {
$admin = $this->maniaControl->playerManager->getPlayer($adminLogin); $admin = $this->maniaControl->playerManager->getPlayer($adminLogin);
if (!$this->maniaControl->authenticationManager->checkPermission($admin, self::SETTING_PERMISSION_FORCE_PLAYER_SPEC)) { if (!$this->maniaControl->authenticationManager->checkPermission($admin, self::SETTING_PERMISSION_FORCE_PLAYER_SPEC)) {
$this->maniaControl->authenticationManager->sendNotAllowed($admin); $this->maniaControl->authenticationManager->sendNotAllowed($admin);