Fixed infinite blank spawning (CargoType data Type)

CaregoType is now held as a CargoType, rather than byte in TaskDataData CargoType is now serialised as int (byte is not wide enough to store all values of CargoType)
N95JPL · May 18, 2024 · 8adb497 · 8adb497
1 parent 440b917
commit 8adb497
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Multiplayer/Networking/Data/TaskDataData.cs b/Multiplayer/Networking/Data/TaskDataData.cs
@@ -228,7 +228,7 @@ public class WarehouseTaskData : TaskBeforeDataData
     public string[] Cars { get; set; }
     public byte WarehouseTaskType { get; set; }
     public string WarehouseMachine { get; set; }
-    public byte CargoType { get; set; }
+    public CargoType CargoType { get; set; }
     public float CargoAmount { get; set; }
     public bool ReadyForMachine { get; set; }
 
@@ -239,7 +239,7 @@ public static WarehouseTaskData FromWarehouseTask(WarehouseTask task)
             Cars = task.cars.Select(x => x.ID).ToArray(),
             WarehouseTaskType = (byte)task.warehouseTaskType,
             WarehouseMachine = task.warehouseMachine.ID,
-            CargoType = (byte)task.cargoType,
+            CargoType = task.cargoType,
             CargoAmount = task.cargoAmount,
             ReadyForMachine = task.readyForMachine
         };
@@ -251,7 +251,7 @@ public static WarehouseTask ToWarehouseTask(WarehouseTaskData data)
             CarSpawner.Instance.allCars.FindAll(x => data.Cars.Contains(x.ID)).Select(x => x.logicCar).ToList(),
             (WarehouseTaskType)data.WarehouseTaskType,
             JobSaveManager.Instance.GetWarehouseMachineWithId(data.WarehouseMachine),
-            (CargoType)data.CargoType,
+            data.CargoType,
             data.CargoAmount
         );
     }
@@ -262,7 +262,7 @@ public static void Serialize(NetDataWriter writer, WarehouseTaskData data)
         writer.PutArray(data.Cars);
         writer.Put(data.WarehouseTaskType);
         writer.Put(data.WarehouseMachine);
-        writer.Put(data.CargoType);
+        writer.Put((int)data.CargoType);
         writer.Put(data.CargoAmount);
         writer.Put(data.ReadyForMachine);
     }
@@ -274,7 +274,7 @@ public static WarehouseTaskData Deserialize(NetDataReader reader)
         data.Cars = reader.GetStringArray();
         data.WarehouseTaskType = reader.GetByte();
         data.WarehouseMachine = reader.GetString();
-        data.CargoType = reader.GetByte();
+        data.CargoType = (CargoType)reader.GetInt();
         data.CargoAmount = reader.GetFloat();
         data.ReadyForMachine = reader.GetBool();