diff options
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 3702ede1428..3767f254eeb 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -276,6 +276,13 @@ void SmartAI::ReturnToLastOOCPos() void SmartAI::UpdateAI(uint32 diff) { + if (!me->IsAlive()) + { + if (IsEngaged()) + EngagementOver(); + return; + } + CheckConditions(diff); GetScript()->OnUpdate(diff); diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index cc4d7126826..d1c76f3aa6e 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2469,7 +2469,7 @@ void Creature::CallAssistance() void Creature::CallForHelp(float radius) { - if (radius <= 0.0f || !IsEngaged() || IsPet() || IsCharmed()) + if (radius <= 0.0f || !IsEngaged() || !IsAlive() || IsPet() || IsCharmed()) return; Unit* target = GetThreatManager().GetCurrentVictim(); @@ -2480,7 +2480,7 @@ void Creature::CallForHelp(float radius) if (!target) { - TC_LOG_ERROR("entities.unit", "Creature %u (%s) is engaged without threat list", GetEntry(), GetName().c_str()); + TC_LOG_ERROR("entities.unit", "Creature %u (%s) trying to call for help without being in combat.", GetEntry(), GetName().c_str()); return; } |