diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-08-07 14:16:59 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-08-07 14:16:59 -0500 |
| commit | c9fc56364bbb89ea18f5206b43e55e2b7aa652bd (patch) | |
| tree | 59ddafefab1939b51efd7bb2fbddbb3ef6efbcfd /src/server/game/Entities/Unit | |
| parent | d82266bc0ef31df82dc67c1023d6208df6ac247b (diff) | |
| parent | 44557b57ffec34c4cad94469d629da06173981a7 (diff) | |
Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rwxr-xr-x | 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 e57c5a99acd..3da56bbef89 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1381,7 +1381,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss) int32 overkill = int32(damage) - int32(GetHealth()); data << uint32(overkill > 0 ? overkill : 0); // Overkill data << uint32(i_spellProto->SchoolMask); - data << uint32(0); // Unknown 4.x + data << uint32(0); // FIX ME: Send resisted damage, both fully resisted and partly resisted victim->SendMessageToSet(&data, true); victim->DealDamage(this, damage, 0, SPELL_DIRECT_DAMAGE, i_spellProto->GetSchoolMask(), i_spellProto, true); |
