PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-20 02:54:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #779 from Fate-JH/sunburst

Browse source 
Dragon Sunburst
This commit is contained in:
Fate-JH 2021-04-19 00:21:00 -04:00 committed by GitHub
parent 2dc1b5736a 69b8237d42
commit 20c37ba7fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/scala/net/psforever/objects/vital/projectile/ProjectileDamageModifierFunctions.scala
View file

@ -119,8 +119,8 @@ case object InfantryAggravatedSplashBurn extends ProjectileDamageModifiers.Mod {
case object FireballAggravatedBurn extends ProjectileDamageModifiers.Mod {
def calculate(damage: Int, data: DamageInteraction, cause: ProjectileReason): Int = {
if (damage > 0 &&
(cause.resolution == DamageResolution.AggravatedDirectBurn ||
cause.resolution == DamageResolution.AggravatedSplashBurn)) {
(data.resolution == DamageResolution.AggravatedDirectBurn ||
data.resolution == DamageResolution.AggravatedSplashBurn)) {
//add resist to offset resist subtraction later
1 + cause.damageModel.ResistUsing(data)(data)
} else {