araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-17 21:50:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
Subv
2012-08-07 14:16:59 -05:00
parent d82266bc0e 44557b57ff
commit c9fc56364b
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+1 -1
View File
@@ -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);