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

Unused variable removed

Browse Source
This commit is contained in:
MagicBot
2024-04-15 11:01:53 -04:00
parent e1a9ddae89
commit 9dbefcd830
2 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/ForgeManager.java
+9 -31
View File
@@ -17,7 +17,6 @@ import engine.net.client.msg.ItemProductionMsg;
import engine.objects.*;
import engine.powers.EffectsBase;
import engine.powers.poweractions.AbstractPowerAction;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
import java.util.ArrayList;
@@ -58,38 +57,18 @@ public enum ForgeManager implements Runnable {
if (Objects.requireNonNull(workOrder).runCanceled || workOrder.runCompleted)
continue;
// Persist current items that are currently cooking for this
// workOrder
ArrayList<Item> toRemove = new ArrayList<>();
Item completed_item = null;
for (Item cooked_item : workOrder.cooking) {
toRemove.add(cooked_item);
cooked_item.containerType = mbEnums.ItemContainerType.INVENTORY;
completed_item = DbManager.ItemQueries.PERSIST(cooked_item);
workOrder.vendor.charItemManager.addItemToInventory(completed_item);
}
// Remove the fake negativeID item from all collections.
// set the items as 'completed'
for (Item memoryItem : toRemove) {
// Update vendor windows
ItemProductionMsg outMsg1 = new ItemProductionMsg(workOrder.vendor.building, workOrder.vendor, memoryItem, mbEnums.ProductionActionType.COMPLETE, true);
DispatchMessage.dispatchMsgToInterestArea(workOrder.vendor, outMsg1, mbEnums.DispatchChannel.SECONDARY, MBServerStatics.STRUCTURE_LOAD_RANGE, false, false);
workOrder.cooking.remove(memoryItem);
inMemoryItemLookup.remove(memoryItem.objectUUID);
vendorItemLookup.get(workOrder.vendor).remove(memoryItem);
}
Logger.info("item forged:" + workOrder.workOrderID + " (" + workOrder.total_produced + "/" + workOrder.total_to_produce + ")");
// Complete this workOrder. Persist items currently in memory
// and set the items as completed.
if (workOrder.total_produced >= workOrder.total_to_produce) {
for (Item workOrderItem : workOrder.cooking) {
workOrderItem.setDateToUpgrade(0);
}
Logger.info("workOrder has completed: " + workOrder.workOrderID);
workOrder.runCompleted = true;
continue;
@@ -319,7 +298,6 @@ public enum ForgeManager implements Runnable {
inMemoryItemLookup.put(forged_item.objectUUID, forged_item);
vendorItemLookup.computeIfAbsent(workOrder.vendor, k -> new ArrayList<>());
vendorItemLookup.get(workOrder.vendor).add(forged_item);
vendorItemLookup.get(workOrder.vendor).add(forged_item);
vendorWorkOrderLookup.get(workOrder.vendor).add(workOrder);
// Update NPC window