aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkandera <kanderacutie@hotmail.com>2012-05-16 07:55:22 -0700
committerkandera <kanderacutie@hotmail.com>2012-05-16 07:55:22 -0700
commit0c3dbb3a57c5fb32fe6ecefeaada980e49a7d7f8 (patch)
tree2679ff19793f5251cb030c234cc536c7b79ae7d8
parentc70792df02858a93c156ac00b4a1fdd366c994ec (diff)
parentb90cb5878de2afc621c0b9ebc86066c2b827f428 (diff)
Merge pull request #6522 from Vincent-Michael/TakenCalculation
Core/Spell: Fix SpellDamageBonusTaken calculation for negative value
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index f1e5f05bd35..aaba0102f55 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10875,7 +10875,7 @@ uint32 Unit::SpellDamageBonusTaken(Unit* caster, SpellInfo const* spellProto, ui
TakenTotal+= int32(TakenAdvertisedBenefit * coeff * factorMod);
}
- float tmpDamage = (pdamage + TakenTotal) * TakenTotalMod;
+ float tmpDamage = (int32(pdamage) + TakenTotal) * TakenTotalMod;
return uint32(std::max(tmpDamage, 0.0f));
}