Changed NearestAttackableUnitInObjectRangeCheck to only consider neutral units as targets if they are already in combat with target searching unit

2017-09-20 00:28:17 -04:00
parent 1b9bf99d8c
commit 87e0b1a603
2 changed files with 7 additions and 3 deletions
@@ -1582,7 +1582,7 @@ namespace Game.Maps
        public bool Invoke(Unit u)
        {
            if (u.isTargetableForAttack() && i_obj.IsWithinDistInMap(u, i_range) &&
-                !i_funit.IsFriendlyTo(u) && i_funit.CanSeeOrDetect(u))
+                (i_funit.IsInCombatWith(u) || i_funit.IsHostileTo(u)) && i_obj.CanSeeOrDetect(u))
            {
                i_range = i_obj.GetDistance(u);        // use found unit range as new range limit for next check
                return true;
@@ -1606,7 +1606,11 @@ namespace Game.Maps
            i_range = range;

            if (_spellInfo == null)
-                _spellInfo = i_obj.ToDynamicObject().GetSpellInfo();
+            {
+                DynamicObject dynObj = i_obj.ToDynamicObject();
+                if (dynObj)
+                    _spellInfo = dynObj.GetSpellInfo();
+            }
        }

        public bool Invoke(Unit u)