Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-16 23:19:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14974 from pete318/stealth_work

Browse Source 
Stealth changes (Player stealthed vs NPCs) - 3.3.5
(cherry picked from commit 90fcfb3f2d)

Conflicts:
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Unit/Unit.cpp
This commit is contained in:
mik1893
2015-07-15 18:43:19 +02:00
committed by DDuarte
parent 0ea0e9ee01
commit fa0e5289a8
11 changed files with 108 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
View File

@@ -120,7 +120,13 @@ void npc_escortAI::MoveInLineOfSight(Unit* who)
{
if (!me->GetVictim())
{
who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
// Clear distracted state on combat
if (me->HasUnitState(UNIT_STATE_DISTRACTED))
{
me->ClearUnitState(UNIT_STATE_DISTRACTED);
me->GetMotionMaster()->Clear();
}
AttackStart(who);
}
else if (me->GetMap()->IsDungeon())

8
src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
View File

@@ -117,7 +117,13 @@ void FollowerAI::MoveInLineOfSight(Unit* who)
{
if (!me->GetVictim())
{
who->RemoveAurasByType(SPELL_AURA_MOD_STEALTH);
// Clear distracted state on combat
if (me->HasUnitState(UNIT_STATE_DISTRACTED))
{
me->ClearUnitState(UNIT_STATE_DISTRACTED);
me->GetMotionMaster()->Clear();
}
AttackStart(who);
}
else if (me->GetMap()->IsDungeon())