From 9067eb22ced9fdceb36f344b63af0edae1f4142a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 8 Aug 2021 13:03:57 +0200 Subject: Core/Units: Fixed crash in Unit::CalcArmorReducedDamage when called from periodic aura tick if caster is no longer in world Closes #26776 --- src/server/game/Entities/Unit/Unit.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index ac699cd5725..e015c6ca4a0 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1634,11 +1634,15 @@ void Unit::HandleEmoteCommand(uint32 anim_id, Trinity::IteratorPairGetLevelForTarget(victim); + attackerClass = Classes(attacker->getClass()); + } // Expansion and ContentTuningID necessary? Does Player get a ContentTuningID too ? - float armorConstant = sDB2Manager.EvaluateExpectedStat(ExpectedStatType::ArmorConstant, attackerLevel, -2, 0, Classes(attacker->getClass())); + float armorConstant = sDB2Manager.EvaluateExpectedStat(ExpectedStatType::ArmorConstant, attackerLevel, -2, 0, attackerClass); if (!(armor + armorConstant)) return damage; -- cgit v1.2.3