Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Unit: fix logic error in DamageInfo::ModifyDamage.

Browse Source 
Previous code did not protect against m_damage underflow, rather only allow up to duplicate damage.
It now should work as intended.

Closes #18154
(cherry picked from commit 7ced76bab2)

Core/Unit: fix warning reported by VS2015

C4146: unary minus operator applied to unsigned type, result still unsigned
(cherry picked from commit 7b1a0c3698)

Core/Unit: consistency fix
(cherry picked from commit 042023877a)
This commit is contained in:
ariel-
2016-10-27 18:29:56 +02:00
committed by joschiwald
parent b63cd1951f
commit e4bb4842b5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -173,7 +173,7 @@ DamageInfo::DamageInfo(SpellNonMeleeDamage const& spellNonMeleeDamage, DamageEff
void DamageInfo::ModifyDamage(int32 amount)
{
amount = std::min(amount, int32(GetDamage()));
amount = std::max(amount, -static_cast<int32>(GetDamage()));
m_damage += amount;
}