upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 03:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Static from CachedPlayerData so it doesnt cross through worlds

Browse Source
This commit is contained in:
Kam committed 2023-06-05 18:44:43 -04:00
1 parent 3dc99dcf2c
commit d545e4ba89
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/controllers/PlayerDataController.java
+4 -4
View File
@@ -30,8 +30,8 @@ import static noppes.npcs.util.CustomNPCsThreader.playerDataThread;
public class PlayerDataController {
public static PlayerDataController instance;
public static HashMap<String, String> nameUUIDs;
private static final CacheHashMap<String, CacheHashMap.CachedObject<PlayerData>> playerDataCache = new CacheHashMap<>(60 * 60 * 1000);
public HashMap<String, String> nameUUIDs;
private final CacheHashMap<String, CacheHashMap.CachedObject<PlayerData>> playerDataCache = new CacheHashMap<>(60 * 60 * 1000);
public PlayerDataController(){
instance = this;
@@ -249,13 +249,13 @@ public class PlayerDataController {
return new NBTTagCompound();
}
public static void putPlayerDataCache(final String uuid, final PlayerData playerCompound) {
public void putPlayerDataCache(final String uuid, final PlayerData playerCompound) {
synchronized (playerDataCache) {
playerDataCache.put(uuid, new CacheHashMap.CachedObject<>(playerCompound));
}
}
public static PlayerData getPlayerDataCache(final String uuid) {
public PlayerData getPlayerDataCache(final String uuid) {
synchronized (playerDataCache) {
if (!playerDataCache.containsKey(uuid)) {
return null;
src/main/java/noppes/npcs/controllers/data/PlayerData.java
+1 -1
View File
@@ -220,7 +220,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
filename = uuid + ".json";
}
PlayerDataController.instance.putPlayerMap(playername, uuid);
PlayerDataController.putPlayerDataCache(uuid, this);
PlayerDataController.instance.putPlayerDataCache(uuid, this);
CustomNPCsThreader.playerDataThread.execute(() -> {
try {
File saveDir = PlayerDataController.instance.getSaveDir();