We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -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 { |
@@ -31,7 +31,7 @@ |
||
31 | 31 | // Delete all tickets and re-insert the winning ticket |
32 | 32 | $db->write('DELETE FROM player_has_ticket WHERE game_id = ' . $db->escapeNumber($gameID)); |
33 | 33 | $db->write('INSERT INTO player_has_ticket (game_id, account_id, time, prize) ' |
34 | - .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
34 | + .'VALUES (' . $db->escapeNumber($gameID) . ',' . $db->escapeNumber($winner_id) . ',\'0\',' . $db->escapeNumber($lottoInfo['Prize']) . ')'); |
|
35 | 35 | |
36 | 36 | $db->unlock(); |
37 | 37 |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | // Send vote announcement to members of the player's council (war votes) |
45 | 45 | // or both races' councils (peace votes). |
46 | 46 | $councilMembers = Council::getRaceCouncil($player->getGameID(), |
47 | - $player->getRaceID()); |
|
47 | + $player->getRaceID()); |
|
48 | 48 | if ($type == 'PEACE') { |
49 | 49 | $otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id); |
50 | 50 | $councilMembers = array_merge($councilMembers, $otherCouncil); |
@@ -54,15 +54,15 @@ discard block |
||
54 | 54 | $color = ($type == 'PEACE' ? 'dgreen' : 'red'); |
55 | 55 | $type_fancy = "<span class=\"$color\">$type</span>"; |
56 | 56 | $message = $player->getLevelName() . " " . $player->getBBLink() |
57 | - . " has initiated a vote for $type_fancy with the [race=$race_id]!" |
|
58 | - . "You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
59 | - . " to cast your vote."; |
|
57 | + . " has initiated a vote for $type_fancy with the [race=$race_id]!" |
|
58 | + . "You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
59 | + . " to cast your vote."; |
|
60 | 60 | |
61 | 61 | foreach ($councilMembers as $accountID) { |
62 | 62 | // don't send to the player who started the vote |
63 | 63 | if ($player->getAccountID() != $accountID) { |
64 | 64 | SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(), |
65 | - $accountID, $message, $time); |
|
65 | + $accountID, $message, $time); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 |