We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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); |
@@ -35,7 +35,7 @@ |
||
35 | 35 | } |
36 | 36 | $helper = self::getTwitterObj($_SESSION['TwitterToken']); |
37 | 37 | $accessToken = $helper->oauth('oauth/access_token', |
38 | - ['oauth_verifier' => \Request::get('oauth_verifier')]); |
|
38 | + ['oauth_verifier' => \Request::get('oauth_verifier')]); |
|
39 | 39 | $auth = self::getTwitterObj($accessToken); |
40 | 40 | $userInfo = $auth->get('account/verify_credentials', ['include_email' => 'true']); |
41 | 41 | if ($auth->getLastHttpCode() == 200) { |
@@ -32,7 +32,7 @@ |
||
32 | 32 | // Delete all tickets and re-insert the winning ticket |
33 | 33 | $db->query('DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($gameID)); |
34 | 34 | $db->query('INSERT INTO player_has_ticket (game_id, account_id, time, prize) ' |
35 | - .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
35 | + .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
36 | 36 | |
37 | 37 | $db->unlock(); |
38 | 38 |
@@ -924,14 +924,14 @@ |
||
924 | 924 | |
925 | 925 | public function isFederal() { |
926 | 926 | return $this->getShipTypeID() == SHIP_TYPE_FEDERAL_DISCOVERY || |
927 | - $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT || |
|
928 | - $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
927 | + $this->getShipTypeID() == SHIP_TYPE_FEDERAL_WARRANT || |
|
928 | + $this->getShipTypeID() == SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
929 | 929 | } |
930 | 930 | |
931 | 931 | public function isUnderground() { |
932 | 932 | return $this->getShipTypeID() == SHIP_TYPE_THIEF || |
933 | - $this->getShipTypeID() == SHIP_TYPE_ASSASSIN || |
|
934 | - $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER; |
|
933 | + $this->getShipTypeID() == SHIP_TYPE_ASSASSIN || |
|
934 | + $this->getShipTypeID() == SHIP_TYPE_DEATH_CRUISER; |
|
935 | 935 | } |
936 | 936 | |
937 | 937 | public function shootPlayers(array $targetPlayers) { |