Merge branch 'master' into master

This commit is contained in:
Chris Miles
2017-11-21 21:26:52 -06:00
committed by GitHub
37 changed files with 543 additions and 184 deletions
+1 -1
View File
@@ -1298,7 +1298,7 @@ void Mob::AI_Process() {
if (AI_PursueCastCheck()) {
//we did something, so do not process movement.
}
else if (AI_movement_timer->Check())
else if (AI_movement_timer->Check() && target)
{
if (!IsRooted()) {
Log(Logs::Detail, Logs::AI, "Pursuing %s while engaged.", target->GetName());