aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/AI/ScriptedAI
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/AI/ScriptedAI')
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp4
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
index c305a5e3f6f..c219d459cb1 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
@@ -319,8 +319,8 @@ void EscortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false */,
me->GetMotionMaster()->Clear(MOTION_PRIORITY_NORMAL);
// disable npcflags
- me->SetNpcFlags(UNIT_NPC_FLAG_NONE);
- me->SetNpcFlags2(UNIT_NPC_FLAG_2_NONE);
+ me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE);
+ me->ReplaceAllNpcFlags2(UNIT_NPC_FLAG_2_NONE);
if (me->IsImmuneToNPC())
{
_hasImmuneToNPCFlags = true;
diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
index 3ae0f5e0c94..41a63754262 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -184,8 +184,8 @@ void FollowerAI::StartFollow(Player* player, uint32 factionForFollower, uint32 q
me->GetMotionMaster()->Clear(MOTION_PRIORITY_NORMAL);
me->PauseMovement();
- me->SetNpcFlags(UNIT_NPC_FLAG_NONE);
- me->SetNpcFlags2(UNIT_NPC_FLAG_2_NONE);
+ me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE);
+ me->ReplaceAllNpcFlags2(UNIT_NPC_FLAG_2_NONE);
AddFollowState(STATE_FOLLOW_INPROGRESS);