Ignore Entity fix

.gitignore

@@ -337,4 +337,7 @@ ASALocalRun/
 .localhistory/
 
 # BeatPulse healthcheck temp database
-healthchecksdb
+healthchecksdb
+
+# KDiff3
+*.orig

DebuffPanel.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using ExileCore.PoEMemory.Components;
+using ExileCore.PoEMemory.MemoryObjects;
+using ExileCore.Shared.Cache;
+using ExileCore.Shared.Enums;
+using SharpDX;
+
+namespace HealthBars
+{
+    public class DebuffPanel
+    {
+        public DebuffPanel(Entity entity)
+        {
+            _Entity = entity ?? throw new ArgumentNullException(nameof(entity));
+        }
+
+        private Entity _Entity { get; }
+
+        public List<Buff> Bleed => _Entity.Buffs.Where(b => b.Name == "bleeding_stack").ToList();
+        public List<Buff> CorruptedBlood => _Entity.Buffs.Where(b => b.Name == "corrupted_blood").ToList();
+        public Buff CurseVulnerability => _Entity.Buffs.FirstOrDefault(b => b.Name == "curse_vulnerability");
+        public Buff AuraPride => _Entity.Buffs.FirstOrDefault(b => b.Name == "player_physical_damage_aura");
+    }
+}

HealthBar.cs

@@ -1,72 +1,47 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using ExileCore.PoEMemory.Components;
 using ExileCore.PoEMemory.MemoryObjects;
 using ExileCore.Shared.Cache;
 using ExileCore.Shared.Enums;
 using SharpDX;
+using System;
 
 namespace HealthBars
 {
-    public class DebuffPanelConfig
-    {
-        public Dictionary<string, int> Bleeding { get; set; }
-        public Dictionary<string, int> Corruption { get; set; }
-        public Dictionary<string, int> Poisoned { get; set; }
-        public Dictionary<string, int> Frozen { get; set; }
-        public Dictionary<string, int> Chilled { get; set; }
-        public Dictionary<string, int> Burning { get; set; }
-        public Dictionary<string, int> Shocked { get; set; }
-        public Dictionary<string, int> WeakenedSlowed { get; set; }
-    }
-
     public class HealthBar
     {
-        private const int DPS_CHECK_TIME = 1000;
-        private const int DPS_FAST_CHECK_TIME = 200;
-        private const int DPS_POP_TIME = 2000;
-        private static readonly List<string> IgnoreEntitiesList = new List<string> {"MonsterFireTrap2", "MonsterBlastRainTrap", "VolatileDeadCore"};
-        private readonly Stopwatch dpsStopwatch = Stopwatch.StartNew();
-        private readonly TimeCache<float> _distance;
-        private bool _init;
-        private int _lastHp;
-        public RectangleF BackGround;
-        public bool CanNotDie;
-        public double DiedFrames = 0;
-        public Func<bool> IsHidden;
-        private bool isHostile;
+        public bool Skip { get; set; } = false;
+        public UnitSettings Settings { get; private set; }
+        public RectangleF BackGround { get; set; }
+        public DebuffPanel DebuffPanel { get; set; }
+        private TimeCache<float> _DistanceCache { get; set; }
+        public float Distance => _DistanceCache.Value;
+        public Entity Entity { get; }
+        public CreatureType Type { get; private set; }
+        public Life Life => Entity.GetComponent<Life>();
+        public float HpPercent => Life?.HPPercentage ?? 100;
+        public float HpWidth { get; set; }
+        public float EsWidth { get; set; }
         private readonly Action OnHostileChange = delegate { };
-        public bool Skip = false;
-
+        private bool isHostile;
+        public bool CanNotDie;
+        private bool _init;
         public HealthBar(Entity entity, HealthBarsSettings settings)
         {
             Entity = entity;
-            _distance = new TimeCache<float>(() => entity.DistancePlayer, 200);
-
-            IsHidden = () => entity.IsHidden;
-
-            // If ignored entity found, skip
-            foreach (var _entity in IgnoreEntitiesList)
-            {
-                if (entity.Path.Contains(_entity))
-                    return;
-            }
-
+            _DistanceCache = new TimeCache<float>(() => entity.DistancePlayer, 200);
+            DebuffPanel = new DebuffPanel(entity);
             Update(entity, settings);
-
-            //CanNotDie = entity.GetComponent<Stats>().StatDictionary.ContainsKey(GameStat.CannotDie);
             CanNotDie = entity.Path.StartsWith("Metadata/Monsters/Totems/Labyrinth");
 
-            if (entity.HasComponent<ObjectMagicProperties>() && entity.GetComponent<ObjectMagicProperties>().Mods.Contains("MonsterConvertsOnDeath_"))
+            var mods = entity?.GetComponent<ObjectMagicProperties>()?.Mods;
+            if (mods != null && mods.Contains("MonsterConvertsOnDeath_"))
             {
                 OnHostileChange = () =>
                 {
                     if (_init) Update(Entity, settings);
                 };
             }
         }
-
         public bool IsHostile
         {
             get
@@ -83,20 +58,11 @@ public bool IsHostile
             }
         }
 
-        public int MaxHp { get; private set; }
-        public float HpPercent { get; set; }
-        public float Distance => _distance.Value;
-        public Life Life => Entity.GetComponent<Life>();
-        public Entity Entity { get; }
-        public UnitSettings Settings { get; private set; }
-        public CreatureType Type { get; private set; }
-        public LinkedList<int> DpsQueue { get; } = new LinkedList<int>();
-
         public Color Color
         {
             get
             {
-                if (IsHidden())
+                if (IsHidden(Entity))
                     return Color.LightGray;
 
                 if (HpPercent <= 0.1f)
@@ -106,8 +72,24 @@ public Color Color
             }
         }
 
-        public float HpWidth { get; set; }
-        public float EsWidth { get; set; }
+        private bool IsHidden(Entity entity)
+        {
+            try
+            {
+                return entity.IsHidden;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+        public bool IsShow(bool showEnemy)
+        {
+            if (Settings == null)
+                return false;
+
+            return !IsHostile ? Settings.Enable.Value : Settings.Enable.Value && showEnemy && IsHostile;
+        }
 
         public void Update(Entity entity, HealthBarsSettings settings)
         {
@@ -120,11 +102,15 @@ public void Update(Entity entity, HealthBarsSettings settings)
             {
                 if (entity.IsHostile)
                 {
-                    var objectMagicProperties = entity.GetComponent<ObjectMagicProperties>();
-
-                    if (objectMagicProperties != null)
+                    var rarity = entity.GetComponent<ObjectMagicProperties>();
+                    if(rarity == null)
                     {
-                        switch (objectMagicProperties.Rarity)
+                        Type = CreatureType.Minion;
+                        Settings = settings.Minions;
+                    }
+                    else
+                    {
+                        switch (rarity.Rarity)
                         {
                             case MonsterRarity.White:
                                 Type = CreatureType.Normal;
@@ -158,55 +144,6 @@ public void Update(Entity entity, HealthBarsSettings settings)
                     Settings = settings.Minions;
                 }
             }
-
-            _lastHp = GetFullHp();
-            MaxHp = Life.MaxHP;
-            _init = true;
-        }
-
-        public bool IsShow(bool showEnemy)
-        {
-            if (Settings == null)
-                return false;
-
-            return !IsHostile ? Settings.Enable.Value : Settings.Enable.Value && showEnemy && IsHostile;
-        }
-
-        public void DpsRefresh()
-        {
-            var checkTime = DpsQueue.Count > 0 ? DPS_CHECK_TIME : DPS_FAST_CHECK_TIME;
-
-            if (dpsStopwatch.ElapsedMilliseconds >= checkTime)
-            {
-                var hp = GetFullHp();
-
-                if (hp > -1000000 && hp < 10000000 && _lastHp != hp)
-                {
-                    DpsQueue.AddFirst(-(_lastHp - hp));
-
-                    if (DpsQueue.Count > Settings.FloatingCombatStackSize)
-                    {
-                        DpsQueue.RemoveLast();
-                        dpsStopwatch.Restart();
-                    }
-
-                    _lastHp = hp;
-                }
-            }
-        }
-
-        public void DpsDequeue()
-        {
-            if (dpsStopwatch.ElapsedMilliseconds >= DPS_POP_TIME)
-            {
-                if (DpsQueue.Count > 0) DpsQueue.RemoveLast();
-                dpsStopwatch.Restart();
-            }
-        }
-
-        private int GetFullHp()
-        {
-            return Life.CurHP + Life.CurES;
         }
     }
 }