Update to workOrder cleanup

2024-05-11 08:49:44 -04:00
parent 7993fb22d2
commit c545468f26
1 changed files with 7 additions and 3 deletions
@@ -329,12 +329,16 @@ public enum BuildingManager {
        }

        // Clear all workorders for this hireling
-        if (hireling.getObjectType().equals(GameObjectType.NPC))
-            if (ForgeManager.vendorWorkOrderLookup.contains(hireling))
-                for (WorkOrder workOrder : ForgeManager.vendorWorkOrderLookup.get(hireling)) {
+        if (hireling.getObjectType().equals(GameObjectType.NPC)) {
+
+            NPC hirelingNPC = (NPC) hireling;
+
+            if (ForgeManager.vendorWorkOrderLookup.get(hirelingNPC) != null)
+                for (WorkOrder workOrder : ForgeManager.vendorWorkOrderLookup.get(hirelingNPC)) {
                    workOrder.runCompleted = true;
                    DbManager.WarehouseQueries.DELETE_WORKORDER(workOrder);
                }
+        }
        // Remove hireling from building

        building.getHirelings().remove(hireling);