|
|
@ -329,12 +329,16 @@ public enum BuildingManager { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Clear all workorders for this hireling
|
|
|
|
// Clear all workorders for this hireling
|
|
|
|
if (hireling.getObjectType().equals(GameObjectType.NPC)) |
|
|
|
if (hireling.getObjectType().equals(GameObjectType.NPC)) { |
|
|
|
if (ForgeManager.vendorWorkOrderLookup.contains(hireling)) |
|
|
|
|
|
|
|
for (WorkOrder workOrder : ForgeManager.vendorWorkOrderLookup.get(hireling)) { |
|
|
|
NPC hirelingNPC = (NPC) hireling; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (ForgeManager.vendorWorkOrderLookup.get(hirelingNPC) != null) |
|
|
|
|
|
|
|
for (WorkOrder workOrder : ForgeManager.vendorWorkOrderLookup.get(hirelingNPC)) { |
|
|
|
workOrder.runCompleted = true; |
|
|
|
workOrder.runCompleted = true; |
|
|
|
DbManager.WarehouseQueries.DELETE_WORKORDER(workOrder); |
|
|
|
DbManager.WarehouseQueries.DELETE_WORKORDER(workOrder); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
// Remove hireling from building
|
|
|
|
// Remove hireling from building
|
|
|
|
|
|
|
|
|
|
|
|
building.getHirelings().remove(hireling); |
|
|
|
building.getHirelings().remove(hireling); |
|
|
|