[9159] Skip invisible/stealthed and not detected targets from threat …

…list at next target selection. This will fix work spell 58984 and similar in combat.
mangos · Jan 12, 2010 · d58b53d · d58b53d
1 parent 06e99ea
commit d58b53d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
@@ -1607,16 +1607,19 @@ void Creature::SaveRespawnTime()
 
 bool Creature::IsOutOfThreatArea(Unit* pVictim) const
 {
-    if(!pVictim)
+    if (!pVictim)
+        return true;
+
+    if (!pVictim->IsInMap(this))
         return true;
 
-    if(!pVictim->IsInMap(this))
+    if (!pVictim->isTargetableForAttack())
         return true;
 
-    if(!pVictim->isTargetableForAttack())
+    if (!pVictim->isInAccessablePlaceFor(this))
         return true;
 
-    if(!pVictim->isInAccessablePlaceFor(this))
+    if (!pVictim->isVisibleForOrDetect(this,this,false))
         return true;
 
     if(sMapStore.LookupEntry(GetMapId())->IsDungeon())

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9158"
+ #define REVISION_NR "9159"
 #endif // __REVISION_NR_H__