Fixed pickup & filtering

Application/RSBot/Views/SplashScreen.cs

@@ -1,5 +1,4 @@
 using RSBot.Core;
-using RSBot.Core.Components;
 using RSBot.Theme.Controls;
 using System;
 using System.IO;

Library/RSBot.Core/Components/PickupManager.cs

@@ -76,59 +76,68 @@ public static void Run(Position centerPosition, int radius = 50)
                 return;
 
             Running = true;
-            var playerJid = Game.Player.JID;
-
-            bool condition(SpawnedItem e)
-            {
-                var tolarance = 15;
-                var isInside = e.Movement.Source.DistanceTo(centerPosition) <= radius + tolarance;
-                var selfish = JustPickMyItems && e.OwnerJID == playerJid;
-
-                return isInside && (selfish || !JustPickMyItems);
-            }
-
-            if (!SpawnManager.TryGetEntities<SpawnedItem>(out var entites, p => condition(p)))
-            {
-                Stop();
-                return;
-            }
-
-            foreach (var item in entites.OrderBy(item => item.Movement.Source.DistanceTo(centerPosition)).Take(5))
+            try
             {
-                if (!Running)
-                    return;
+                var playerJid = Game.Player.JID;
 
-                if (PickupGold && item.Record.IsGold)
+                bool condition(SpawnedItem e)
                 {
-                    if (UseAbilityPet && Game.Player.HasActiveAbilityPet)
-                        Game.Player.AbilityPet.Pickup(item.UniqueId);
-                    else
-                        item.Pickup();
+                    var tolarance = 15;
+                    var isInside = e.Movement.Source.DistanceTo(centerPosition) <= radius + tolarance;
+                    var selfish = JustPickMyItems && e.OwnerJID == playerJid;
 
-                    continue;
+                    return isInside && (selfish || !JustPickMyItems);
                 }
 
-                //Pickup regular items
-                if (PickupFilter.Invoke(item.Record))
+                if (!SpawnManager.TryGetEntities<SpawnedItem>(out var entites, p => condition(p)))
                 {
-                    if (UseAbilityPet && Game.Player.HasActiveAbilityPet && !Game.Player.AbilityPet.Full)
-                        Game.Player.AbilityPet.Pickup(item.UniqueId);
-                    else
-                        item.Pickup();
-
-                    continue;
+                    Stop();
+                    return;
                 }
 
-                if (PickupRareItems && (byte)item.Rarity >= 2)
+                foreach (var item in entites.OrderBy(item => item.Movement.Source.DistanceTo(centerPosition)).Take(5))
                 {
-                    if (UseAbilityPet && Game.Player.HasActiveAbilityPet && !Game.Player.AbilityPet.Full)
-                        Game.Player.AbilityPet.Pickup(item.UniqueId);
-                    else
-                        item.Pickup();
+                    if (!Running)
+                        return;
+
+                    if (PickupGold && item.Record.IsGold)
+                    {
+                        if (UseAbilityPet && Game.Player.HasActiveAbilityPet)
+                            Game.Player.AbilityPet.Pickup(item.UniqueId);
+                        else
+                            item.Pickup();
+
+                        continue;
+                    }
+
+                    //Pickup regular items
+                    if (PickupFilter.Invoke(item.Record))
+                    {
+                        if (UseAbilityPet && Game.Player.HasActiveAbilityPet && !Game.Player.AbilityPet.Full)
+                            Game.Player.AbilityPet.Pickup(item.UniqueId);
+                        else
+                            item.Pickup();
+
+                        continue;
+                    }
+
+                    if (PickupRareItems && (byte)item.Rarity >= 2)
+                    {
+                        if (UseAbilityPet && Game.Player.HasActiveAbilityPet && !Game.Player.AbilityPet.Full)
+                            Game.Player.AbilityPet.Pickup(item.UniqueId);
+                        else
+                            item.Pickup();
+                    }
                 }
             }
-
-            Running = false;
+            catch (System.Exception e)
+            {
+                Log.Fatal(e);
+            }
+            finally
+            {
+                Running = false;
+            }
         }
 
         /// <summary>

Library/RSBot.Core/Components/SpawnManager.cs

@@ -96,7 +96,7 @@ public static bool TryGetEntities<T>(out IEnumerable<T> entities, Func<T, bool>
         {
             lock (_lock)
             {
-                entities = _entities.Cast<T>().Where(p => predicate(p));
+                entities = _entities.FindAll(p => p is T && predicate(p as T)).Cast<T>();
 
                 return entities != null;
             }

Library/RSBot.Core/Log.cs

@@ -49,6 +49,8 @@ public static void AppendFormat(LogLevel logLevel, string format, params object[
         /// <param name="obj">The message</param>
         public static void Fatal(Exception obj)
         {
+            Warn(obj.Message);
+
             var filePath = Path.Combine(Environment.CurrentDirectory, "User", "Logs", "Exceptions", $"{DateTime.Now:dd-MM-yyyy}.txt");
             if (!Directory.Exists(filePath))
                 Directory.CreateDirectory(Path.GetDirectoryName(filePath));