Fixed issues #328 (#339)

SDClowen · Jul 25, 2022 · 8ece2a5 · 8ece2a5
1 parent 8bc7e43
commit 8ece2a5
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/Library/RSBot.Core/Components/PickupManager.cs b/Library/RSBot.Core/Components/PickupManager.cs
@@ -119,16 +119,29 @@ bool condition(SpawnedItem e)
                     return;
                 }
 
-                foreach (var item in entities.OrderBy(item => item.Movement.Source.DistanceTo(centerPosition))/*.Take(5)*/)
+                if (UseAbilityPet && Game.Player.HasActiveAbilityPet)
                 {
-                    if (!Running)
-                        return;
+                    foreach (var item in entities.OrderBy(item => item.Movement.Source.DistanceTo(centerPosition))/*.Take(5)*/)
+                    {
+                        if (!Running)
+                            return;
 
-                    if (UseAbilityPet && Game.Player.HasActiveAbilityPet)
                         Game.Player.AbilityPet.Pickup(item.UniqueId);
-                    else
-                        item.Pickup();
+                    }
+                }
+                else
+                {
+                    var pickingItem = entities.OrderBy(item => item.Movement.Source.DistanceTo(centerPosition)).FirstOrDefault();
+                    if(pickingItem == null)
+                    {
+                        Stop();
+                        return;
+                    }
+
+                    pickingItem.Pickup();
                 }
+
+
             }
             catch (System.Exception e)
             {