We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | while ($this->db->nextRecord()) { |
| 315 | 315 | try { |
| 316 | 316 | $otherPlayer = SmrPlayer::getPlayer($this->db->getInt('from_account_id'), |
| 317 | - $this->getGameID(), $forceUpdate); |
|
| 317 | + $this->getGameID(), $forceUpdate); |
|
| 318 | 318 | } catch (PlayerNotFoundException $e) { |
| 319 | 319 | // Skip players that have not joined this game |
| 320 | 320 | continue; |
@@ -878,9 +878,9 @@ discard block |
||
| 878 | 878 | */ |
| 879 | 879 | public function canFight() { |
| 880 | 880 | return !($this->hasNewbieTurns() || |
| 881 | - $this->isDead() || |
|
| 882 | - $this->isLandedOnPlanet() || |
|
| 883 | - $this->hasFederalProtection()); |
|
| 881 | + $this->isDead() || |
|
| 882 | + $this->isLandedOnPlanet() || |
|
| 883 | + $this->hasFederalProtection()); |
|
| 884 | 884 | } |
| 885 | 885 | |
| 886 | 886 | public function setDead($bool) { |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | */ |
| 45 | 45 | public function getValue() : int { |
| 46 | 46 | if ($this->rank == self::RANK_JACK || |
| 47 | - $this->rank == self::RANK_QUEEN || |
|
| 48 | - $this->rank == self::RANK_KING) { |
|
| 47 | + $this->rank == self::RANK_QUEEN || |
|
| 48 | + $this->rank == self::RANK_KING) { |
|
| 49 | 49 | return 10; |
| 50 | 50 | } elseif ($this->isAce()) { |
| 51 | 51 | return 11; |
@@ -549,7 +549,7 @@ |
||
| 549 | 549 | */ |
| 550 | 550 | public function setWarp(SmrSector $warp) { |
| 551 | 551 | if ($this->getWarp() == $warp->getSectorID() && |
| 552 | - $warp->getWarp() == $this->getSectorID()) { |
|
| 552 | + $warp->getWarp() == $this->getSectorID()) { |
|
| 553 | 553 | // Warps are already set correctly! |
| 554 | 554 | return; |
| 555 | 555 | } |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | if (!empty(BUG_REPORT_TO_ADDRESSES)) { |
| 70 | 70 | $mail = setupMailer(); |
| 71 | 71 | $mail->Subject = (defined('PAGE_PREFIX') ? PAGE_PREFIX : '??? ') . |
| 72 | - 'Automatic Bug Report'; |
|
| 72 | + 'Automatic Bug Report'; |
|
| 73 | 73 | $mail->setFrom('[email protected]'); |
| 74 | 74 | $mail->Body = $message; |
| 75 | 75 | foreach (BUG_REPORT_TO_ADDRESSES as $toAddress) { |
@@ -20,11 +20,11 @@ |
||
| 20 | 20 | $this->includeTemplate('includes/ForceFullCombatResults.inc.php', array('FullForceCombatResults'=>$CombatResults)); |
| 21 | 21 | } elseif ($CombatResultsType == 'PORT') { |
| 22 | 22 | $this->includeTemplate('includes/PortFullCombatResults.inc.php', array('FullPortCombatResults'=>$CombatResults, |
| 23 | - 'MinimalDisplay'=>false, |
|
| 24 | - 'AlreadyDestroyed'=>false)); |
|
| 23 | + 'MinimalDisplay'=>false, |
|
| 24 | + 'AlreadyDestroyed'=>false)); |
|
| 25 | 25 | } elseif ($CombatResultsType == 'PLANET') { |
| 26 | 26 | $this->includeTemplate('includes/PlanetFullCombatResults.inc.php', array('FullPlanetCombatResults'=>$CombatResults, |
| 27 | - 'MinimalDisplay'=>false, |
|
| 28 | - 'AlreadyDestroyed'=>false)); |
|
| 27 | + 'MinimalDisplay'=>false, |
|
| 28 | + 'AlreadyDestroyed'=>false)); |
|
| 29 | 29 | } |
| 30 | 30 | ?> |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | } else { |
| 7 | 7 | // Killed by port, planet, forces |
| 8 | 8 | echo 'The <span class="creds"> ' . number_format($KillResults['LostCredits']) |
| 9 | - . '</span> credits that were onboard ' . $TargetPlayer->getDisplayName() |
|
| 10 | - . "'s ship are lost in the wreckage.<br />"; |
|
| 9 | + . '</span> credits that were onboard ' . $TargetPlayer->getDisplayName() |
|
| 10 | + . "'s ship are lost in the wreckage.<br />"; |
|
| 11 | 11 | } |
| 12 | 12 | ?> |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | if (!$UniGen) { |
| 103 | 103 | $CanScanSector = ($ThisShip->hasScanner() && $isLinkedSector) || $isCurrentSector; |
| 104 | 104 | $ShowFriendlyForces = isset($HideAlliedForces) && $HideAlliedForces ? |
| 105 | - $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer); |
|
| 105 | + $Sector->hasPlayerForces($MapPlayer) : $Sector->hasFriendlyForces($MapPlayer); |
|
| 106 | 106 | if (($CanScanSector && ($Sector->hasForces() || $Sector->hasPlayers())) || $ShowFriendlyForces || $Sector->hasFriendlyTraders($MapPlayer)) { ?> |
| 107 | 107 | <div class="lmtf"><?php |
| 108 | 108 | if ($CanScanSector && $Sector->hasEnemyTraders($MapPlayer)) { |
@@ -55,9 +55,9 @@ |
||
| 55 | 55 | function applyHofVisibilityMask($amount, $vis, $gameID, $accountID) { |
| 56 | 56 | global $account, $player; |
| 57 | 57 | if (($vis == HOF_PRIVATE && $account->getAccountID() != $accountID) || |
| 58 | - ($vis == HOF_ALLIANCE && isset($gameID) && |
|
| 59 | - !SmrGame::getGame($gameID)->hasEnded() && |
|
| 60 | - !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($player))) |
|
| 58 | + ($vis == HOF_ALLIANCE && isset($gameID) && |
|
| 59 | + !SmrGame::getGame($gameID)->hasEnded() && |
|
| 60 | + !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($player))) |
|
| 61 | 61 | { |
| 62 | 62 | return '-'; |
| 63 | 63 | } else { |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | foreach (\Globals::getGoods() as $goodId => $value) { |
| 91 | 91 | if ($goods[$goodId] === true) { |
| 92 | 92 | if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_SELLS && |
| 93 | - $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 93 | + $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 94 | 94 | $rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId); |
| 95 | 95 | } |
| 96 | 96 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | foreach (\Globals::getGoods() as $goodId => $value) { |
| 119 | 119 | if ($goods[$goodId] === true) { |
| 120 | 120 | if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_SELLS && |
| 121 | - $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 121 | + $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) { |
|
| 122 | 122 | $owr = new OneWayRoute($currentSectorId, $targetSectorId, $sectors[$currentSectorId]->getPort()->getRaceID(), $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId); |
| 123 | 123 | $fakeReturn = new OneWayRoute($targetSectorId, $currentSectorId, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOODS_NOTHING); |
| 124 | 124 | $mpr = new MultiplePortRoute($owr, $fakeReturn); |