Merge pull request #6239 from The-Game/master

Core/Spell: Fix unit tracking to not being limited to the caster of SPELL_AURA_MOD_STALKED.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 70b680c6ae0..e26bc0a6ea1 100755
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -626,7 +626,10 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask*
                         if (!target->isAllowedToLoot(creature))
                             dynamicFlags &= ~UNIT_DYNFLAG_LOOTABLE;
                     }
-
+                    if(dynamicFlags & UNIT_DYNFLAG_TRACK_UNIT)
+                        if (Unit const* unit = ToUnit())
+                            if (!unit->HasAuraTypeWithCaster(SPELL_AURA_MOD_STALKED, target->GetGUID()))
+                                dynamicFlags &= ~UNIT_DYNFLAG_TRACK_UNIT;
                     *data << dynamicFlags;
                 }
                 // FG: pretend that OTHER players in own group are friendly ("blue")