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

Concurrency update

Browse Source
This commit is contained in:
MagicBot
2024-04-22 07:35:59 -04:00
parent 11013bcd07
commit 0e7336b8c6
3 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
+1 -1
View File
@@ -29,7 +29,7 @@ public enum ForgeManager implements Runnable {
private static final BlockingQueue<WorkOrder> forge = new DelayQueue<>(); private static final BlockingQueue<WorkOrder> forge = new DelayQueue<>();
public static final AtomicInteger wordOrderCounter = new AtomicInteger(0); public static final AtomicInteger wordOrderCounter = new AtomicInteger(0);
public static final ConcurrentHashMap<NPC, CopyOnWriteArrayList<WorkOrder>> vendorWorkOrderLookup = new ConcurrentHashMap<>(); public static final ConcurrentHashMap<NPC, ConcurrentHashMap.KeySetView<WorkOrder, Boolean>> vendorWorkOrderLookup = new ConcurrentHashMap<>();
public static final ConcurrentHashMap<Item, WorkOrder> itemWorkOrderLookup = new ConcurrentHashMap<>(); public static final ConcurrentHashMap<Item, WorkOrder> itemWorkOrderLookup = new ConcurrentHashMap<>();
@Override @Override
src/engine/gameManager/NPCManager.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.pmw.tinylog.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import static engine.math.FastMath.acos; import static engine.math.FastMath.acos;
@@ -523,7 +523,7 @@ public enum NPCManager {
ArrayList<Item> itemList = new ArrayList<>(); ArrayList<Item> itemList = new ArrayList<>();
List<WorkOrder> vendorWorkOrders = ForgeManager.vendorWorkOrderLookup.get(npc); ConcurrentHashMap.KeySetView<WorkOrder, Boolean> vendorWorkOrders = ForgeManager.vendorWorkOrderLookup.get(npc);
for (WorkOrder workOrder : vendorWorkOrders) for (WorkOrder workOrder : vendorWorkOrders)
itemList.addAll(workOrder.cooking); itemList.addAll(workOrder.cooking);
src/engine/objects/NPC.java
+1 -2
View File
@@ -35,7 +35,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import static engine.net.client.msg.ErrorPopupMsg.sendErrorPopup; import static engine.net.client.msg.ErrorPopupMsg.sendErrorPopup;
@@ -873,7 +872,7 @@ public class NPC extends AbstractCharacter {
// If NPC is a vendor then configure ForgeManager support // If NPC is a vendor then configure ForgeManager support
if (this.contract.isTrainer() == false) if (this.contract.isTrainer() == false)
ForgeManager.vendorWorkOrderLookup.computeIfAbsent(this, k -> new CopyOnWriteArrayList<>()); ForgeManager.vendorWorkOrderLookup.computeIfAbsent(this, k -> ConcurrentHashMap.newKeySet());
this.symbol = this.contract.getIconID(); this.symbol = this.contract.getIconID();
this.modTypeTable = this.contract.getNPCModTypeTable(); this.modTypeTable = this.contract.getNPCModTypeTable();