We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | while ($this->db->nextRecord()) { |
| 308 | 308 | try { |
| 309 | 309 | $otherPlayer = SmrPlayer::getPlayer($this->db->getInt('from_account_id'), //TODO |
| 310 | - $this->getGameID(), $forceUpdate); |
|
| 310 | + $this->getGameID(), $forceUpdate); |
|
| 311 | 311 | } catch (PlayerNotFoundException $e) { |
| 312 | 312 | // Skip players that have not joined this game |
| 313 | 313 | continue; |
@@ -879,9 +879,9 @@ discard block |
||
| 879 | 879 | */ |
| 880 | 880 | public function canFight() { |
| 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) { |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | // Send vote announcement to members of the player's council (war votes) |
| 40 | 40 | // or both races' councils (peace votes). |
| 41 | 41 | $councilMembers = Council::getRaceCouncil($player->getGameID(), |
| 42 | - $player->getRaceID()); |
|
| 42 | + $player->getRaceID()); |
|
| 43 | 43 | if ($type == 'PEACE') { |
| 44 | 44 | $otherCouncil = Council::getRaceCouncil($player->getGameID(), $race_id); |
| 45 | 45 | $councilMembers = array_merge($councilMembers, $otherCouncil); |
@@ -49,16 +49,16 @@ discard block |
||
| 49 | 49 | $color = ($type == 'PEACE' ? 'dgreen' : 'red'); |
| 50 | 50 | $type_fancy = "<span class=\"$color\">$type</span>"; |
| 51 | 51 | $message = $player->getLevelName() . " " . $player->getBBLink() |
| 52 | - . " has initiated a vote for $type_fancy with the " |
|
| 53 | - . Globals::getRaceName($race_id) |
|
| 54 | - . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 55 | - . " to cast your vote."; |
|
| 52 | + . " has initiated a vote for $type_fancy with the " |
|
| 53 | + . Globals::getRaceName($race_id) |
|
| 54 | + . "! You have " . format_time(TIME_FOR_COUNCIL_VOTE) |
|
| 55 | + . " to cast your vote."; |
|
| 56 | 56 | |
| 57 | 57 | foreach ($councilMembers as $playerID) { |
| 58 | 58 | // don't send to the player who started the vote |
| 59 | 59 | if ($player->getPlayerID() != $playerID) { |
| 60 | 60 | SmrPlayer::sendMessageFromRace($player->getRaceID(), $player->getGameID(), |
| 61 | - $playerID, $message, $time); |
|
| 61 | + $playerID, $message, $time); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | |
@@ -15,11 +15,11 @@ |
||
| 15 | 15 | // Special case for leaders who haven't made their own alliance yet, |
| 16 | 16 | // or are still in the Newbie Help Alliance. |
| 17 | 17 | $teams[$leader->getPlayerID()] = array('Leader' => $leader, |
| 18 | - 'Size' => 0); |
|
| 18 | + 'Size' => 0); |
|
| 19 | 19 | } else { |
| 20 | 20 | $teams[$leader->getPlayerID()] = array('Leader' => $leader, |
| 21 | - 'Alliance' => $alliance, |
|
| 22 | - 'Size' => $alliance->getNumMembers()); |
|
| 21 | + 'Alliance' => $alliance, |
|
| 22 | + 'Size' => $alliance->getNumMembers()); |
|
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | 25 | |
@@ -30,8 +30,8 @@ |
||
| 30 | 30 | $leader = SmrPlayer::getPlayer($db->getInt('leader_player_id'), $player->getGameID()); |
| 31 | 31 | $pickedPlayer = SmrPlayer::getPlayer($db->getInt('picked_player_id'), $player->getGameID()); |
| 32 | 32 | $history[] = array('Leader' => $leader, |
| 33 | - 'Player' => $pickedPlayer, |
|
| 34 | - 'Time' => $db->getInt('time')); |
|
| 33 | + 'Player' => $pickedPlayer, |
|
| 34 | + 'Time' => $db->getInt('time')); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $template->assign('History', $history); |