Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository

This commit is contained in:
Akkadius
2020-06-29 00:40:27 -05:00
34 changed files with 1366 additions and 509 deletions
+4 -1
View File
@@ -1319,7 +1319,10 @@ void Mob::AI_Process() {
FaceTarget();
}
}
else if (AI_movement_timer->Check() && target) {
// mob/npc waits until call for help complete, others can move
else if (AI_movement_timer->Check() && target &&
(GetOwnerID() || IsBot() ||
CastToNPC()->GetCombatEvent())) {
if (!IsRooted()) {
LogAI("Pursuing [{}] while engaged", target->GetName());
RunTo(target->GetX(), target->GetY(), target->GetZ());