We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -870,9 +870,9 @@ |
||
| 870 | 870 | */ |
| 871 | 871 | public function canFight(): bool { |
| 872 | 872 | return !($this->hasNewbieTurns() || |
| 873 | - $this->isDead() || |
|
| 874 | - $this->isLandedOnPlanet() || |
|
| 875 | - $this->hasFederalProtection()); |
|
| 873 | + $this->isDead() || |
|
| 874 | + $this->isLandedOnPlanet() || |
|
| 875 | + $this->hasFederalProtection()); |
|
| 876 | 876 | } |
| 877 | 877 | |
| 878 | 878 | public function setDead(bool $bool): void { |
@@ -67,9 +67,9 @@ |
||
| 67 | 67 | $session = Session::getInstance(); |
| 68 | 68 | $account = $session->getAccount(); |
| 69 | 69 | if (($vis == HOF_PRIVATE && $account->getAccountID() != $accountID) || |
| 70 | - ($vis == HOF_ALLIANCE && isset($gameID) && |
|
| 71 | - !SmrGame::getGame($gameID)->hasEnded() && |
|
| 72 | - !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer()))) { |
|
| 70 | + ($vis == HOF_ALLIANCE && isset($gameID) && |
|
| 71 | + !SmrGame::getGame($gameID)->hasEnded() && |
|
| 72 | + !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer()))) { |
|
| 73 | 73 | return '-'; |
| 74 | 74 | } else { |
| 75 | 75 | return $amount; |