MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Junk or completion removes slot from workOrder

Browse Source
This commit is contained in:
MagicBot
2024-04-22 08:28:43 -04:00
parent 41aefa4a48
commit 27d140f703
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/ForgeManager.java
-5
View File
@@ -46,11 +46,6 @@ public enum ForgeManager implements Runnable {
Logger.error(e); Logger.error(e);
} }
// Do not process null workOrders
if (workOrder == null)
continue;
if (workOrder.total_produced >= workOrder.total_to_produce) { if (workOrder.total_produced >= workOrder.total_to_produce) {
// Complete this workOrder. // Complete this workOrder.
src/engine/net/client/handlers/ItemProductionMsgHandler.java
+4
View File
@@ -146,6 +146,8 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
ForgeManager.itemWorkOrderLookup.remove(virtualItem); ForgeManager.itemWorkOrderLookup.remove(virtualItem);
DbManager.removeFromCache(virtualItem); DbManager.removeFromCache(virtualItem);
workOrder.slots_used = workOrder.slots_used - 1;
// If this is the last item then remove the workOrder from the game // If this is the last item then remove the workOrder from the game
if (workOrder.cooking.isEmpty()) if (workOrder.cooking.isEmpty())
@@ -395,6 +397,8 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
DbManager.removeFromCache(virtualItem); DbManager.removeFromCache(virtualItem);
ForgeManager.itemWorkOrderLookup.remove(virtualItem); ForgeManager.itemWorkOrderLookup.remove(virtualItem);
workOrder.slots_used = workOrder.slots_used - 1;
// If this is the last item then remove the workOrder from the game // If this is the last item then remove the workOrder from the game
if (workOrder.cooking.isEmpty()) if (workOrder.cooking.isEmpty())