diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-08-01 01:26:44 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-17 22:54:01 +0100 |
| commit | 4330b7c921203486174fa818908b74d06f61c9f8 (patch) | |
| tree | 26e0a5c733ec08bfc99b702f6046c0a6887bc3f9 /src | |
| parent | 970a89a8c3e615244b5968e04d888100fba2cff0 (diff) | |
Entities/Unit: fix an unrelated check from doing nothing because somebody didn't understand how type-casting works
(cherry picked from commit 0b722e23cf0cdbd7b9753ffe77b349930c34779e)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
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 4fb19e41fcb..996f06bbf5f 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1579,7 +1579,7 @@ void Unit::HandleEmoteCommand(uint32 anim_id, Player* target /*=nullptr*/, Trini return damage; float mitigation = std::min(armor / (armor + armorConstant), 0.85f); - return std::max<uint32>(damage * (1.0f - mitigation), 0); + return uint32(std::max(damage * (1.0f - mitigation), 0.0f)); } /*static*/ uint32 Unit::CalcSpellResistedDamage(Unit const* attacker, Unit* victim, uint32 damage, SpellSchoolMask schoolMask, SpellInfo const* spellInfo) |