We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -121,12 +121,12 @@ |
||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) { |
| 124 | - $return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker); |
|
| 125 | - $return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']); |
|
| 124 | + $return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker); |
|
| 125 | + $return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']); |
|
| 126 | 126 | $return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']); |
| 127 | 127 | |
| 128 | 128 | if ($return['ActualDamage']['KillingShot']) { |
| 129 | - $return['KillResults'] =& $targetPlayer->killPlayerByForces($forces); |
|
| 129 | + $return['KillResults'] = & $targetPlayer->killPlayerByForces($forces); |
|
| 130 | 130 | } |
| 131 | 131 | return $return; |
| 132 | 132 | } |
@@ -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) { |