From 4ac437419f7407059780b31c456a15e3c41e67b0 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Sat, 29 Oct 2022 12:16:26 +0200
Subject: [PATCH] fix(Core/Units): Fixed uninitialized `m_cleanDamage` variable
 after e390087 (#13485)

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

Improved 252755415c87
---
 src/server/game/Entities/Unit/Unit.cpp      | 3 ++-
 src/server/scripts/Spells/spell_rogue.cpp   | 2 +-
 src/server/scripts/Spells/spell_warrior.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 981597fd7..35f0a4dbd 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -124,7 +124,8 @@ DamageInfo::DamageInfo(CalcDamageInfo const& dmgInfo) : DamageInfo(DamageInfo(dm
 
 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_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)
 {
 }
 
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index cddeabf53..bb6b8b9e2 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -122,7 +122,7 @@ class spell_rog_blade_flurry : public AuraScript
         DamageInfo* damageInfo = eventInfo.GetDamageInfo();
         if (procTarget && damageInfo)
         {
-            int32 damage = damageInfo->GetDamage();
+            int32 damage = damageInfo->GetUnmitigatedDamage();
 
             CustomSpellValues values;
             values.AddSpellMod(SPELLVALUE_BASE_POINT0, damage);
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index d5f253ffe..35aec6db2 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -668,7 +668,7 @@ class spell_warr_sweeping_strikes : public AuraScript
             }
             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);
             }
         }