Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/SAI: allow to pause/resume waypoint for non-escorting NPCs (#20684)

Browse Source
This commit is contained in:
Wyreth
2017-10-22 21:37:38 +02:00
committed by Shauren
parent b4d632e57d
commit 21bd52cb99
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/AI/SmartScripts/SmartAI.cpp
View File

@@ -128,9 +128,6 @@ bool SmartAI::LoadPath(uint32 entry)
void SmartAI::PausePath(uint32 delay, bool forced) void SmartAI::PausePath(uint32 delay, bool forced)
{ {
if (!HasEscortState(SMART_ESCORT_ESCORTING))
return;
if (HasEscortState(SMART_ESCORT_PAUSED)) if (HasEscortState(SMART_ESCORT_PAUSED))
{ {
TC_LOG_ERROR("misc", "SmartAI::PausePath: Creature entry %u wanted to pause waypoint (current waypoint: %u) movement while already paused, ignoring.", me->GetEntry(), _currentWaypointNode); TC_LOG_ERROR("misc", "SmartAI::PausePath: Creature entry %u wanted to pause waypoint (current waypoint: %u) movement while already paused, ignoring.", me->GetEntry(), _currentWaypointNode);
@@ -155,9 +152,6 @@ void SmartAI::PausePath(uint32 delay, bool forced)
void SmartAI::StopPath(uint32 DespawnTime, uint32 quest, bool fail) void SmartAI::StopPath(uint32 DespawnTime, uint32 quest, bool fail)
{ {
if (!HasEscortState(SMART_ESCORT_ESCORTING))
return;
if (quest) if (quest)
mEscortQuestID = quest; mEscortQuestID = quest;
@@ -269,9 +263,6 @@ void SmartAI::ReturnToLastOOCPos()
void SmartAI::UpdatePath(const uint32 diff) void SmartAI::UpdatePath(const uint32 diff)
{ {
if (!HasEscortState(SMART_ESCORT_ESCORTING))
return;
if (_escortInvokerCheckTimer < diff) if (_escortInvokerCheckTimer < diff)
{ {
if (!IsEscortInvokerInRange()) if (!IsEscortInvokerInRange())