Sanity check for deleted vendors
This commit is contained in:
@@ -200,6 +200,10 @@ public class dbWarehouseHandler extends dbHandlerBase {
|
|||||||
while (rs.next()) {
|
while (rs.next()) {
|
||||||
JSONObject jsonObject = new JSONObject(rs.getString("workorder"));
|
JSONObject jsonObject = new JSONObject(rs.getString("workorder"));
|
||||||
WorkOrder workOrder = new WorkOrder(jsonObject);
|
WorkOrder workOrder = new WorkOrder(jsonObject);
|
||||||
|
|
||||||
|
if (workOrder.vendor == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
submitList.add(workOrder);
|
submitList.add(workOrder);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
@@ -84,6 +84,11 @@ public class WorkOrder implements Delayed {
|
|||||||
this.completionTime = jsonWorkOrder.getLong("completionTime");
|
this.completionTime = jsonWorkOrder.getLong("completionTime");
|
||||||
this.runCompleted.set(jsonWorkOrder.getBoolean("runCompleted"));
|
this.runCompleted.set(jsonWorkOrder.getBoolean("runCompleted"));
|
||||||
|
|
||||||
|
// Vendor sanity check. Might have been deleted
|
||||||
|
|
||||||
|
if (this.vendor == null)
|
||||||
|
return;
|
||||||
|
|
||||||
JSONObject productionCostMap = jsonWorkOrder.getJSONObject("production_cost");
|
JSONObject productionCostMap = jsonWorkOrder.getJSONObject("production_cost");
|
||||||
|
|
||||||
for (String key : productionCostMap.keySet()) {
|
for (String key : productionCostMap.keySet()) {
|
||||||
@@ -107,6 +112,7 @@ public class WorkOrder implements Delayed {
|
|||||||
for (Object o : tokenList) {
|
for (Object o : tokenList) {
|
||||||
int prefix = ((JSONArray) o).getInt(0);
|
int prefix = ((JSONArray) o).getInt(0);
|
||||||
int suffix = ((JSONArray) o).getInt(1);
|
int suffix = ((JSONArray) o).getInt(1);
|
||||||
|
|
||||||
Item cookingItem = ForgeManager.forgeItem(this);
|
Item cookingItem = ForgeManager.forgeItem(this);
|
||||||
cookingItem.prefixToken = prefix;
|
cookingItem.prefixToken = prefix;
|
||||||
cookingItem.suffixToken = suffix;
|
cookingItem.suffixToken = suffix;
|
||||||
|
|||||||
Reference in New Issue
Block a user