Hopefully fixed duplicating build queue items (#216)

ekolis · May 22, 2022 · 8d1d8ab · 8d1d8ab
1 parent cd78ff3
commit 8d1d8ab
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/FrEee/Game/Interfaces/IOrderable.cs b/FrEee/Game/Interfaces/IOrderable.cs
@@ -14,7 +14,7 @@ public interface IOrderable : IReferrable
  /// <summary>
  /// The queued orders.
  /// </summary>
- IList<IOrder> Orders { get; }
+ IEnumerable<IOrder> Orders { get; }
 
  void AddOrder(IOrder order);
 
@@ -29,4 +29,4 @@ public interface IOrderable : IReferrable
 
  void RemoveOrder(IOrder order);
  }
-}
+}
diff --git a/FrEee/Game/Objects/Civilization/ConstructionQueue.cs b/FrEee/Game/Objects/Civilization/ConstructionQueue.cs
@@ -225,6 +225,9 @@ public IList<IConstructionOrder> Orders
  private set;
  }
 
+ IEnumerable<IOrder> IOrderable.Orders
+ => Orders;
+
  public Empire Owner
  {
  get { return Container.Owner; }
@@ -289,8 +292,6 @@ public ResourceQuantity UpcomingSpending
  }
  }
 
- IList<IOrder> IOrderable.Orders => Orders.Cast<IOrder>().ToList();
-
  private ResourceQuantity rate;
 
  public void AddOrder(IOrder order)
@@ -576,4 +577,4 @@ private ResourceQuantity ComputeSYAbilityRate()
  return null;
  }
  }
-}
+}
diff --git a/FrEee/Game/Objects/Space/Fleet.cs b/FrEee/Game/Objects/Space/Fleet.cs
@@ -1,4 +1,4 @@
-using FrEee.Game.Enumerations;
+using FrEee.Game.Enumerations;
 using FrEee.Game.Interfaces;
 using FrEee.Game.Objects.Abilities;
 using FrEee.Game.Objects.Civilization;
@@ -377,6 +377,9 @@ public int NormalShields
 
  public IList<IOrder> Orders { get; private set; }
 
+ IEnumerable<IOrder> IOrderable.Orders
+ => Orders;
+
  public int OrganicsMaintenance
  {
  get { return MaintenanceCost[Resource.Organics]; }
@@ -915,4 +918,4 @@ private IEnumerable<string> GetImagePaths(string imagetype)
 
  public bool FillsCombatTile => Vehicles.Any(q => q.FillsCombatTile);
  }
-}
+}
diff --git a/FrEee/Game/Objects/Space/Planet.cs b/FrEee/Game/Objects/Space/Planet.cs
@@ -372,6 +372,9 @@ public double MerchantsRatio
 
  public IList<IOrder> Orders { get; private set; }
 
+ IEnumerable<IOrder> IOrderable.Orders
+ => Orders;
+
  public int OrganicsIncome => this.GrossIncome()[Resource.Organics];
 
  public double OrganicsValue => ResourceValue[Resource.Organics];

diff --git a/FrEee/Game/Objects/Vehicles/SpaceVehicle.cs b/FrEee/Game/Objects/Vehicles/SpaceVehicle.cs
@@ -1,4 +1,4 @@
-using FrEee.Game.Enumerations;
+using FrEee.Game.Enumerations;
 using FrEee.Game.Interfaces;
 using FrEee.Game.Objects.Civilization;
 using FrEee.Game.Objects.Space;
@@ -130,6 +130,9 @@ public IList<IOrder> Orders
  private set;
  }
 
+ IEnumerable<IOrder> IOrderable.Orders
+ => Orders;
+
  public override IEnumerable<IAbilityObject> Parents
  {
  get
@@ -380,4 +383,4 @@ public virtual void SpendTime(double timeElapsed)
  TimeToNextMove += timeElapsed;
  }
  }
-}
+}
diff --git a/FrEee/Utility/Extensions/CommonExtensions.cs b/FrEee/Utility/Extensions/CommonExtensions.cs
@@ -357,12 +357,12 @@ public static bool ExecuteMobileSpaceObjectOrders<T>(this T o)
  runOrders.Add(order);
  if (order.IsComplete && o.Orders.Contains(order))
  {
- o.Orders.RemoveAt(0);
+ o.RemoveOrder(o.Orders.First());
  if (o.AreRepeatOrdersEnabled)
  {
  order.IsComplete = false;
- o.Orders.Add(order);
- if (runOrders.Count == o.Orders.Count)
+ o.AddOrder(order);
+ if (runOrders.Count == o.Orders.Count())
  break; // don't get in an infinite loop of repeating orders
  }
  }