aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiacomo Pozzoni <giacomopoz@gmail.com>2019-02-15 20:03:26 +0100
committerShauren <shauren.trinity@gmail.com>2021-11-23 22:48:39 +0100
commit31dca39c057bf7eef590a060f9e25fed4f4e9eda (patch)
treea43f03814c046d1b52fe587a639ca6c962b8af5f
parent24f9b416227da7fc4e381e1c3f20123ad6530da5 (diff)
3.3.5 threat assert (#23034)
* Core/Creature: Change assert about Threat to log (cherry picked from commit cb8ff7976b1419c6a1334bb49783480d543aff16)
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index fd08a942307..43c62422e00 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2440,7 +2440,12 @@ void Creature::CallForHelp(float radius)
target = GetThreatManager().GetAnyTarget();
if (!target)
target = GetCombatManager().GetAnyTarget();
- ASSERT(target, "Creature %u (%s) is engaged without threat list", GetEntry(), GetName().c_str());
+
+ if (!target)
+ {
+ TC_LOG_ERROR("entities.unit", "Creature %u (%s) is engaged without threat list", GetEntry(), GetName().c_str());
+ return;
+ }
Trinity::CallOfHelpCreatureInRangeDo u_do(this, target, radius);
Trinity::CreatureWorker<Trinity::CallOfHelpCreatureInRangeDo> worker(this, u_do);