Add try/catch block and some other sanity checking to CheckCargoForIt…

…em()
Instruktor · Apr 23, 2013 · 3653f05 · 3653f05
1 parent c81b136
commit 3653f05
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/Questor.Modules/Caching/Cache.cs b/Questor.Modules/Caching/Cache.cs
@@ -2593,9 +2593,28 @@ private Func<EntityCache, int> OrderByLowestHealth()
 
         public DirectItem CheckCargoForItem(int typeIdToFind, int quantityToFind)
         {
-            DirectContainer cargo = Cache.Instance.DirectEve.GetShipsCargo();
-            DirectItem item = cargo.Items.FirstOrDefault(i => i.TypeId == typeIdToFind && i.Quantity >= quantityToFind);
-            return item;
+            try
+            {
+                if (Cache.Instance.DirectEve.GetShipsCargo() != null)
+                {
+                    DirectContainer cargo = Cache.Instance.DirectEve.GetShipsCargo();
+                    if (cargo.Items.Any())
+                    {
+                        DirectItem item = cargo.Items.FirstOrDefault(i => i.TypeId == typeIdToFind && i.Quantity >= quantityToFind);
+                        return item;    
+                    }
+
+                    return null; // no items found
+                }
+
+                return null;
+            }
+            catch (Exception exception)
+            {
+                Logging.Log("Cache.CheckCargoForItem", "Exception [" + exception + "]", Logging.Debug);
+            }
+
+            return null;
         }
 
         public bool CheckifRouteIsAllHighSec()