Fixed bugs

IGP/Pages/BuildCalculator/Parts/BuildChartComponent.razor

@@ -224,21 +224,21 @@ else
             var economyAtSecond = economyOverTime[interval];
 
             var alloyWorkerHarvesters = from harvester in economyAtSecond.HarvestPoints
-                where harvester.Harvest() != null
-                where harvester.Harvest().RequiresWorker
-                where harvester.Harvest().Resource == ResourceType.Alloy
+                where harvester.Harvester() != null
+                where harvester.Harvester().RequiresWorker
+                where harvester.Harvester().Resource == ResourceType.Alloy
                 select harvester;
 
             var alloyAutomaticHarvesters = from harvester in economyAtSecond.HarvestPoints
-                where harvester.Harvest() != null
-                where harvester.Harvest().RequiresWorker == false
-                where harvester.Harvest().Resource == ResourceType.Alloy
+                where harvester.Harvester() != null
+                where harvester.Harvester().RequiresWorker == false
+                where harvester.Harvester().Resource == ResourceType.Alloy
                 select harvester;
 
             var etherAutomaticHarvesters = from harvester in economyAtSecond.HarvestPoints
-                where harvester.Harvest() != null
-                where harvester.Harvest().RequiresWorker == false
-                where harvester.Harvest().Resource == ResourceType.Ether
+                where harvester.Harvester() != null
+                where harvester.Harvester().RequiresWorker == false
+                where harvester.Harvester().Resource == ResourceType.Ether
                 select harvester;
 
             float autoAlloy = 0;
@@ -250,7 +250,7 @@ else
 
             foreach (var alloyAutoHarvester in alloyAutomaticHarvesters)
             {
-                autoAlloy += alloyAutoHarvester.Harvest().Slots * alloyAutoHarvester.Harvest().HarvestedPerInterval;
+                autoAlloy += alloyAutoHarvester.Harvester().Slots * alloyAutoHarvester.Harvester().HarvestedPerInterval;
                 var production = alloyAutoHarvester.Production();
                 if (production != null)
                 {
@@ -260,7 +260,7 @@ else
 
             foreach (var alloyWorkerHarvester in alloyWorkerHarvesters)
             {
-                workerSlots += alloyWorkerHarvester.Harvest().Slots;
+                workerSlots += alloyWorkerHarvester.Harvester().Slots;
                 var production = alloyWorkerHarvester.Production();
                 if (production != null)
                 {
@@ -270,7 +270,7 @@ else
 
             foreach (var etherWorkerHarvester in etherAutomaticHarvesters)
             {
-                autoEther += etherWorkerHarvester.Harvest().Slots * etherWorkerHarvester.Harvest().HarvestedPerInterval;
+                autoEther += etherWorkerHarvester.Harvester().Slots * etherWorkerHarvester.Harvester().HarvestedPerInterval;
                 var production = etherWorkerHarvester.Production();
                 if (production != null)
                 {

IGP/Pages/EconomyComparison/Parts/ChartComponent.razor

@@ -132,15 +132,15 @@
             var economyAtSecond = economyOverTime[interval];
 
             var alloyWorkerHarvesters = from harvester in economyAtSecond.HarvestPoints
-                where harvester.Harvest() != null
-                where harvester.Harvest().RequiresWorker
-                where harvester.Harvest().Resource == ResourceType.Alloy
+                where harvester.Harvester() != null
+                where harvester.Harvester().RequiresWorker
+                where harvester.Harvester().Resource == ResourceType.Alloy
                 select harvester;
 
             var alloyAutomaticHarvesters = from harvester in economyAtSecond.HarvestPoints
-                where harvester.Harvest() != null
-                where harvester.Harvest().RequiresWorker == false
-                where harvester.Harvest().Resource == ResourceType.Alloy
+                where harvester.Harvester() != null
+                where harvester.Harvester().RequiresWorker == false
+                where harvester.Harvester().Resource == ResourceType.Alloy
                 select harvester;
 
 
@@ -152,7 +152,7 @@
 
             foreach (var alloyAutoHarvester in alloyAutomaticHarvesters)
             {
-                autoAlloy += alloyAutoHarvester.Harvest().Slots * alloyAutoHarvester.Harvest().HarvestedPerInterval;
+                autoAlloy += alloyAutoHarvester.Harvester().Slots * alloyAutoHarvester.Harvester().HarvestedPerInterval;
                 var production = alloyAutoHarvester.Production();
                 if (production != null)
                 {
@@ -162,7 +162,7 @@
 
             foreach (var alloyWorkerHarvester in alloyWorkerHarvesters)
             {
-                workerSlots += alloyWorkerHarvester.Harvest().Slots;
+                workerSlots += alloyWorkerHarvester.Harvester().Slots;
                 var production = alloyWorkerHarvester.Production();
                 if (production != null)
                 {

Model/BuildOrders/BuildOrderModel.cs

@@ -94,7 +94,7 @@ public class BuildOrderModel
         return (from ordersAtTime in StartedOrders
             from orders in ordersAtTime.Value
             where ordersAtTime.Key + (orders.Production() == null ? 0 : orders.Production().BuildTime) <= interval
-            where orders.Harvest() != null
+            where orders.Harvester() != null
             select orders).ToList();
     }
 }

Model/Entity/EntityModel.cs

@@ -255,7 +255,7 @@ public class EntityModel
     }
 
 
-    public EntityHarvesterModel Harvest()
+    public EntityHarvesterModel? Harvester()
     {
         return (EntityHarvesterModel)EntityParts.Find(x => x.GetType() == typeof(EntityHarvesterModel))!;
     }

Model/Entity/Parts/IEntityPartInterface.cs

@@ -1,6 +1,9 @@
-namespace Model.Entity.Parts;
+using System.Text.Json.Serialization;
+
+namespace Model.Entity.Parts;
 
 public class IEntityPartInterface
 {
+    [JsonIgnore]
     public EntityModel Parent { get; set; }
 }

Services/Immortal/BuildOrderService.cs

@@ -290,15 +290,9 @@ public class BuildOrderService : IBuildOrderService
     {
         return (from ordersAtTime in _buildOrder.StartedOrders
             from orders in ordersAtTime.Value
-            where ordersAtTime.Key + (orders.Production() == null
-                      ? 0
-                      : orders.Production().BuildTime) <= interval
-                  && !orders.Harvest().IsDepleted(
-                      interval,
-                      ordersAtTime.Key + (orders.Production() == null
-                          ? 0
-                          : orders.Production().BuildTime))
-            where orders.Harvest() != null
+            where orders.Harvester() != null
+            && ordersAtTime.Key + (orders.Production()?.BuildTime ?? 0) <= interval
+            && !orders.Harvester()!.IsDepleted(interval,ordersAtTime.Key + (orders.Production()?.BuildTime ?? 0))
             select orders).ToList();
     }
 

Services/Immortal/EconomyComparisonService.cs

@@ -181,7 +181,7 @@ public class EconomyComparisionService : IEconomyComparisonService
             // Add funds
             foreach (var entity in economyAtSecond.HarvestPoints)
             {
-                var harvester = entity.Harvest();
+                var harvester = entity.Harvester();
                 if (harvester.RequiresWorker)
                     if (harvester.Resource == ResourceType.Alloy)
                     {

Services/Immortal/EconomyService.cs

@@ -167,7 +167,7 @@ public class EconomyService : IEconomyService
 
 
         foreach (var harvesterPoint in
-                 economyAtSecond.HarvestPoints.Select(entity => entity.Harvest()))
+                 economyAtSecond.HarvestPoints.Select(entity => entity.Harvester()))
             //if (harvesterPoint.IsDepleted(economyAtSecond.Interval))
             //    continue;
             switch (harvesterPoint.RequiresWorker)