Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Creature: Fall back to combat list if calling for help without threat list

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/6a91fe3fbe28e3bf36ab6107b9c6cbb842f65262)
This commit is contained in:
hondacrx
2021-10-30 20:22:04 -04:00
parent faa2360995
commit 7050fda482
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Combat/CombatManager.cs
+1 -1
View File
@@ -88,7 +88,7 @@ namespace Game.Combat
return false; return false;
} }
Unit GetAnyTarget() public Unit GetAnyTarget()
{ {
if (!_pveRefs.Empty()) if (!_pveRefs.Empty())
return _pveRefs.First().Value.GetOther(_owner); return _pveRefs.First().Value.GetOther(_owner);
Source/Game/Entities/Creature/Creature.cs
+2
View File
@@ -2182,6 +2182,8 @@ namespace Game.Entities
Unit target = GetThreatManager().GetCurrentVictim(); Unit target = GetThreatManager().GetCurrentVictim();
if (target == null) if (target == null)
target = GetThreatManager().GetAnyTarget(); target = GetThreatManager().GetAnyTarget();
if (target == null)
target = GetCombatManager().GetAnyTarget();
Cypher.Assert(target != null, $"Creature {GetEntry()} ({GetName()}) is engaged without threat list"); Cypher.Assert(target != null, $"Creature {GetEntry()} ({GetName()}) is engaged without threat list");
var u_do = new CallOfHelpCreatureInRangeDo(this, target, radius); var u_do = new CallOfHelpCreatureInRangeDo(this, target, radius);