We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | |
| 34 | 34 | // Form to make planet changes |
| 35 | 35 | $container = Page::create('1.6/universe_create_save_processing.php', |
| 36 | - '1.6/universe_create_sectors.php', $var); |
|
| 36 | + '1.6/universe_create_sectors.php', $var); |
|
| 37 | 37 | $template->assign('CreatePlanetsFormHREF', $container->href()); |
| 38 | 38 | |
| 39 | 39 | // HREF to cancel and return to the previous page |
@@ -94,7 +94,7 @@ |
||
| 94 | 94 | |
| 95 | 95 | // Form to make location changes |
| 96 | 96 | $container = Page::create('1.6/universe_create_save_processing.php', |
| 97 | - '1.6/universe_create_sectors.php', $var); |
|
| 97 | + '1.6/universe_create_sectors.php', $var); |
|
| 98 | 98 | $template->assign('CreateLocationsFormHREF', $container->href()); |
| 99 | 99 | |
| 100 | 100 | // HREF to cancel and return to the previous page |
@@ -7,4 +7,4 @@ |
||
| 7 | 7 | $msg = '<span class="green">SUCCESS: </span>Enabled game ' . $game->getDisplayName(); |
| 8 | 8 | |
| 9 | 9 | Page::create('skeleton.php', 'enable_game.php', |
| 10 | - array('processing_msg' => $msg))->go(); |
|
| 10 | + array('processing_msg' => $msg))->go(); |
|
@@ -55,9 +55,9 @@ |
||
| 55 | 55 | $session = Smr\Session::getInstance(); |
| 56 | 56 | $account = $session->getAccount(); |
| 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($session->getPlayer()))) |
|
| 58 | + ($vis == HOF_ALLIANCE && isset($gameID) && |
|
| 59 | + !SmrGame::getGame($gameID)->hasEnded() && |
|
| 60 | + !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer()))) |
|
| 61 | 61 | { |
| 62 | 62 | return '-'; |
| 63 | 63 | } else { |
@@ -561,7 +561,7 @@ |
||
| 561 | 561 | */ |
| 562 | 562 | public function setWarp(SmrSector $warp) : void { |
| 563 | 563 | if ($this->getWarp() == $warp->getSectorID() && |
| 564 | - $warp->getWarp() == $this->getSectorID()) { |
|
| 564 | + $warp->getWarp() == $this->getSectorID()) { |
|
| 565 | 565 | // Warps are already set correctly! |
| 566 | 566 | return; |
| 567 | 567 | } |
@@ -735,14 +735,14 @@ |
||
| 735 | 735 | |
| 736 | 736 | public function isFederal() : bool { |
| 737 | 737 | return $this->getTypeID() === SHIP_TYPE_FEDERAL_DISCOVERY || |
| 738 | - $this->getTypeID() === SHIP_TYPE_FEDERAL_WARRANT || |
|
| 739 | - $this->getTypeID() === SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
| 738 | + $this->getTypeID() === SHIP_TYPE_FEDERAL_WARRANT || |
|
| 739 | + $this->getTypeID() === SHIP_TYPE_FEDERAL_ULTIMATUM; |
|
| 740 | 740 | } |
| 741 | 741 | |
| 742 | 742 | public function isUnderground() : bool { |
| 743 | 743 | return $this->getTypeID() === SHIP_TYPE_THIEF || |
| 744 | - $this->getTypeID() === SHIP_TYPE_ASSASSIN || |
|
| 745 | - $this->getTypeID() === SHIP_TYPE_DEATH_CRUISER; |
|
| 744 | + $this->getTypeID() === SHIP_TYPE_ASSASSIN || |
|
| 745 | + $this->getTypeID() === SHIP_TYPE_DEATH_CRUISER; |
|
| 746 | 746 | } |
| 747 | 747 | |
| 748 | 748 | public function shootPlayers(array $targetPlayers) : array { |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | function get_turns_message(SmrPlayer $player) : string { |
| 4 | 4 | // turns only update when the player is active, so calculate current turns |
| 5 | 5 | $turns = min($player->getTurns() + $player->getTurnsGained(time(), true), |
| 6 | - $player->getMaxTurns()); |
|
| 6 | + $player->getMaxTurns()); |
|
| 7 | 7 | $msg = $player->getPlayerName() . " has $turns/" . $player->getMaxTurns() . " turns."; |
| 8 | 8 | |
| 9 | 9 | // Calculate time to max turns if under the max |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | $db = Smr\Database::getInstance(); |
| 18 | 18 | $db->switchDatabases($var['HistoryDatabase']); |
| 19 | 19 | $dbResult = $db->read('SELECT start_date, type, end_date, game_name, speed, game_id ' . |
| 20 | - 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
| 20 | + 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
| 21 | 21 | $dbRecord = $dbResult->record(); |
| 22 | 22 | $template->assign('GameName', $game_name); |
| 23 | 23 | $template->assign('Start', date($account->getDateFormat(), $dbRecord->getInt('start_date'))); |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | foreach ($dbResult->records() as $dbRecord) { |
| 322 | 322 | try { |
| 323 | 323 | $otherPlayer = SmrPlayer::getPlayer($dbRecord->getInt('from_account_id'), |
| 324 | - $this->getGameID(), $forceUpdate); |
|
| 324 | + $this->getGameID(), $forceUpdate); |
|
| 325 | 325 | } catch (PlayerNotFoundException $e) { |
| 326 | 326 | // Skip players that have not joined this game |
| 327 | 327 | continue; |
@@ -879,9 +879,9 @@ discard block |
||
| 879 | 879 | */ |
| 880 | 880 | public function canFight() : bool { |
| 881 | 881 | return !($this->hasNewbieTurns() || |
| 882 | - $this->isDead() || |
|
| 883 | - $this->isLandedOnPlanet() || |
|
| 884 | - $this->hasFederalProtection()); |
|
| 882 | + $this->isDead() || |
|
| 883 | + $this->isLandedOnPlanet() || |
|
| 884 | + $this->hasFederalProtection()); |
|
| 885 | 885 | } |
| 886 | 886 | |
| 887 | 887 | public function setDead(bool $bool) : void { |