Core/AI: fix _returnToStart handling in ScriptedEscortAI

Author: ccrs

src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp

@@ -176,22 +176,23 @@ void EscortAI::UpdateAI(uint32 diff)
                     if (_despawnAtEnd)
                     {
                         TC_LOG_DEBUG("scripts.ai.escortai", "EscortAI::UpdateAI: reached end of waypoints, despawning at end ({})", me->GetGUID().ToString());
-                        if (_returnToStart)
-                        {
-                            Position respawnPosition;
-                            float orientation = 0.f;
-                            me->GetRespawnPosition(respawnPosition.m_positionX, respawnPosition.m_positionY, respawnPosition.m_positionZ, &orientation);
-                            respawnPosition.SetOrientation(orientation);
-                            me->GetMotionMaster()->MovePoint(POINT_HOME, respawnPosition);
-                            TC_LOG_DEBUG("scripts.ai.escortai", "EscortAI::UpdateAI: returning to spawn location: {} ({})", respawnPosition.ToString(), me->GetGUID().ToString());
-                        }
-                        else if (_instantRespawn)
+                        if (_instantRespawn)
                             me->Respawn(true);
                         else
                             me->DespawnOrUnsummon();
                     }
+                    else if (_returnToStart)
+                    {
+                        Position respawnPosition;
+                        float orientation = 0.f;
+                        me->GetRespawnPosition(respawnPosition.m_positionX, respawnPosition.m_positionY, respawnPosition.m_positionZ, &orientation);
+                        respawnPosition.SetOrientation(orientation);
+                        me->GetMotionMaster()->MovePoint(POINT_HOME, respawnPosition);
+                        TC_LOG_DEBUG("scripts.ai.escortai", "EscortAI::UpdateAI: returning to spawn location: {} ({})", respawnPosition.ToString(), me->GetGUID().ToString());
+                    }
+                    else
+                        RemoveEscortState(STATE_ESCORT_ESCORTING);
                     TC_LOG_DEBUG("scripts.ai.escortai", "EscortAI::UpdateAI: reached end of waypoints ({})", me->GetGUID().ToString());
-                    RemoveEscortState(STATE_ESCORT_ESCORTING);
                     return;
                 }