upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-15 19:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added synchronization blocks to functions retrieving objects from CacheHashMaps and made the API use one for caching item stacks as well.

Browse Source
This commit is contained in:
Luis C.M committed 2023-05-31 00:35:57 -05:00
1 parent 3bc02a708e
commit 118d79f3ad
4 files changed
+34 -53
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/scripted/NpcAPI.java
+19 -31
View File
@@ -61,6 +61,7 @@ import noppes.npcs.scripted.entity.*;
import noppes.npcs.scripted.gui.ScriptGui;
import noppes.npcs.scripted.item.*;
import noppes.npcs.scripted.overlay.ScriptOverlay;
import noppes.npcs.util.CacheHashMap;
import noppes.npcs.util.JsonException;
import noppes.npcs.util.LRUHashMap;
import noppes.npcs.util.NBTJsonUtil;
@@ -70,7 +71,7 @@ import java.util.*;
public class NpcAPI extends AbstractNpcAPI {
private static final Map<Integer, ScriptWorld> worldCache = new LRUHashMap<>(10);
private static final HashMap<ItemStack,ScriptItemStack> scriptItemCache = new HashMap<>();
private static final CacheHashMap<ItemStack, CacheHashMap.CachedObject<ScriptItemStack>> scriptItemCache = new CacheHashMap<>(1000);
public static final HashMap<String,Object> engineObjects = new HashMap<>();
public static final EventBus EVENT_BUS = new EventBus();
private static AbstractNpcAPI instance = null;
@@ -353,40 +354,27 @@ public class NpcAPI extends AbstractNpcAPI {
if(itemstack == null)
return null;
ScriptItemStack scriptStack;
if (scriptItemCache.containsKey(itemstack)) {
scriptStack = scriptItemCache.get(itemstack);
} else {
if (itemstack.getItem() instanceof ItemScripted) {
scriptStack = new ScriptCustomItem(itemstack);
} else if (itemstack.getItem() instanceof ItemArmor) {
scriptStack = new ScriptItemArmor(itemstack);
} else if (itemstack.getItem() instanceof ItemBook) {
scriptStack = new ScriptItemBook(itemstack);
} else if (itemstack.getItem() instanceof ItemBlock) {
scriptStack = new ScriptItemBlock(itemstack);
} else {
scriptStack = new ScriptItemStack(itemstack);
}
}
long time = System.currentTimeMillis();
scriptStack.lastAccessed = time;
synchronized (scriptItemCache) {
List<ItemStack> keysToRemove = new ArrayList<>();
for (Map.Entry<ItemStack, ScriptItemStack> entry : scriptItemCache.entrySet()) {
if (time - entry.getValue().lastAccessed > 20000) {
keysToRemove.add(entry.getKey());
ScriptItemStack scriptStack;
if (scriptItemCache.containsKey(itemstack)) {
scriptStack = scriptItemCache.get(itemstack).getObject();
} else {
if (itemstack.getItem() instanceof ItemScripted) {
scriptStack = new ScriptCustomItem(itemstack);
} else if (itemstack.getItem() instanceof ItemArmor) {
scriptStack = new ScriptItemArmor(itemstack);
} else if (itemstack.getItem() instanceof ItemBook) {
scriptStack = new ScriptItemBook(itemstack);
} else if (itemstack.getItem() instanceof ItemBlock) {
scriptStack = new ScriptItemBlock(itemstack);
} else {
scriptStack = new ScriptItemStack(itemstack);
}
scriptItemCache.put(itemstack, new CacheHashMap.CachedObject<>(scriptStack));
}
for (ItemStack key : keysToRemove) {
scriptItemCache.remove(key);
}
scriptItemCache.put(itemstack, scriptStack);
}
return scriptStack;
return scriptStack;
}
}
public IItemStack createItemFromNBT(INbt nbt) {