From 9ef6d87d0aa8c7dad1a05a43b82866a49841348b Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Sun, 18 Sep 2022 02:39:17 +0200 Subject: [PATCH] Fixed user not being loaded in from the database if it was loaded before --- .../java/com/alttd/events/PluginMessageListener.java | 2 -- src/main/java/com/alttd/objects/EconUser.java | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/src/main/java/com/alttd/events/PluginMessageListener.java b/src/main/java/com/alttd/events/PluginMessageListener.java index f0f4e28..df79468 100644 --- a/src/main/java/com/alttd/events/PluginMessageListener.java +++ b/src/main/java/com/alttd/events/PluginMessageListener.java @@ -66,8 +66,6 @@ public class PluginMessageListener implements org.bukkit.plugin.messaging.Plugin .collect(Collectors.joining("\n"))); int minutes = Queries.getMinutesSinceUpdated(uuid); user.removePoints(minutes * 2); - - EconUser.removeQueriedUser(uuid); } }.runTaskAsynchronously(VillagerUI.getInstance()); } diff --git a/src/main/java/com/alttd/objects/EconUser.java b/src/main/java/com/alttd/objects/EconUser.java index 9419b98..bcadbff 100644 --- a/src/main/java/com/alttd/objects/EconUser.java +++ b/src/main/java/com/alttd/objects/EconUser.java @@ -12,14 +12,11 @@ import org.bukkit.scheduler.BukkitRunnable; import org.jetbrains.annotations.Unmodifiable; import java.util.*; -import java.util.concurrent.LinkedBlockingQueue; import java.util.stream.Collectors; public class EconUser { private static Object2ObjectOpenHashMap users = new Object2ObjectOpenHashMap<>(); -// private final static Queue addQueue = new LinkedBlockingQueue<>(); -// private final static Queue removeQueue = new LinkedBlockingQueue<>(); private final UUID uuid; private final Object2ObjectOpenHashMap pointsMap; @@ -48,10 +45,6 @@ public class EconUser { users.remove(uuid); } - public static void removeQueriedUser(UUID uuid) { - queriedUsers.remove(uuid); - } - public UUID getUuid() { return uuid; } @@ -127,11 +120,7 @@ public class EconUser { }); } - private static HashSet queriedUsers = new HashSet<>(); public static void tryLoadUser(UUID uuid) { - if (queriedUsers.contains(uuid) || containsUser(uuid)) - return; - queriedUsers.add(uuid); new BukkitRunnable() { @Override public void run() { @@ -146,7 +135,6 @@ public class EconUser { } public static void removeUser(UUID uuid) { - queriedUsers.remove(uuid); if (Config.DEBUG) Logger.info("Unloading EconUser %", uuid.toString()); // EconUser user = getUser(uuid);