From 1d02149384c66cf7e0e98ef3eb354c5939e30822 Mon Sep 17 00:00:00 2001 From: Treeston Date: Wed, 31 Jul 2019 13:17:32 +0200 Subject: [PATCH] Core/Combat: Properly unset engagement flag on death. # Conflicts: # src/server/game/AI/CoreAI/GuardAI.cpp # src/server/game/Entities/Creature/Creature.cpp --- src/server/game/AI/CreatureAI.cpp | 6 ++++++ src/server/game/Entities/Unit/Unit.cpp | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index e3c2b1aec1..cca5ebce93 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -234,6 +234,12 @@ bool CreatureAI::UpdateVictim() if (!IsEngaged()) return false; + if (!me->IsAlive()) + { + EngagementOver(); + return false; + } + if (!me->HasReactState(REACT_PASSIVE)) { if (Unit* victim = me->SelectVictim()) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index bc5fe709ab..2b19f27da1 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11669,8 +11669,6 @@ void Unit::Kill(Unit* victim, bool durabilityLoss) if (!creature->IsPet()) { - creature->GetThreatManager().ClearAllThreat(); - // must be after setDeathState which resets dynamic flags if (!creature->loot.isLooted()) creature->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);