sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Units): Fixed uninitialized m_cleanDamage variable after e390087 (#13485)

Browse Source 
fix(Core/Units): Fixed uninitialized `m_cleanDamage` variable after e390087.

Improved 252755415c
This commit is contained in:
UltraNix
2022-10-29 12:16:26 +02:00
committed by GitHub
parent 3da4d30371
commit 4ac437419f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+2 -1
View File
@@ -124,7 +124,8 @@ DamageInfo::DamageInfo(CalcDamageInfo const& dmgInfo) : DamageInfo(DamageInfo(dm
DamageInfo::DamageInfo(DamageInfo const& dmg1, DamageInfo const& dmg2) DamageInfo::DamageInfo(DamageInfo const& dmg1, DamageInfo const& dmg2)
: m_attacker(dmg1.m_attacker), m_victim(dmg1.m_victim), m_damage(dmg1.m_damage + dmg2.m_damage), m_spellInfo(dmg1.m_spellInfo), m_schoolMask(SpellSchoolMask(dmg1.m_schoolMask | dmg2.m_schoolMask)), : m_attacker(dmg1.m_attacker), m_victim(dmg1.m_victim), m_damage(dmg1.m_damage + dmg2.m_damage), m_spellInfo(dmg1.m_spellInfo), m_schoolMask(SpellSchoolMask(dmg1.m_schoolMask | dmg2.m_schoolMask)),
m_damageType(dmg1.m_damageType), m_attackType(dmg1.m_attackType), m_absorb(dmg1.m_absorb + dmg2.m_absorb), m_resist(dmg1.m_resist + dmg2.m_resist), m_block(dmg1.m_block) m_damageType(dmg1.m_damageType), m_attackType(dmg1.m_attackType), m_absorb(dmg1.m_absorb + dmg2.m_absorb), m_resist(dmg1.m_resist + dmg2.m_resist), m_block(dmg1.m_block),
m_cleanDamage(dmg1.m_cleanDamage + dmg1.m_cleanDamage)
{ {
} }
src/server/scripts/Spells/spell_rogue.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ class spell_rog_blade_flurry : public AuraScript
DamageInfo* damageInfo = eventInfo.GetDamageInfo(); DamageInfo* damageInfo = eventInfo.GetDamageInfo();
if (procTarget && damageInfo) if (procTarget && damageInfo)
{ {
int32 damage = damageInfo->GetDamage(); int32 damage = damageInfo->GetUnmitigatedDamage();
CustomSpellValues values; CustomSpellValues values;
values.AddSpellMod(SPELLVALUE_BASE_POINT0, damage); values.AddSpellMod(SPELLVALUE_BASE_POINT0, damage);
src/server/scripts/Spells/spell_warrior.cpp
+1 -1
View File
@@ -668,7 +668,7 @@ class spell_warr_sweeping_strikes : public AuraScript
} }
else else
{ {
int32 damage = damageInfo->GetDamage(); int32 damage = damageInfo->GetUnmitigatedDamage();
GetTarget()->CastCustomSpell(_procTarget, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_1, &damage, 0, 0, true, nullptr, aurEff); GetTarget()->CastCustomSpell(_procTarget, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_1, &damage, 0, 0, true, nullptr, aurEff);
} }
} }