feat: locks

common/src/main/java/dev/xhyrom/lighteco/common/command/CommandManager.java

@@ -16,11 +16,18 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class CommandManager {
     protected final LightEcoPlugin plugin;
     @Getter
     private final CommandDispatcher<CommandSource> dispatcher = new CommandDispatcher<>();
+    @Getter
+    private final List<UUID> locks = new CopyOnWriteArrayList<>();
 
     public CommandManager(LightEcoPlugin plugin) {
         this.plugin = plugin;
@@ -45,36 +52,51 @@ public class CommandManager {
     }
 
     public void execute(CommandSender sender, String name, String[] args) {
+        if (locks.contains(sender.getUniqueId())) {
+            sender.sendMessage(MiniMessage.miniMessage().deserialize(
+                    this.plugin.getConfig().messages.wait
+            ));
+            return;
+        }
+
         final CommandSource source = new CommandSource(this.plugin, sender);
         final ParseResults<CommandSource> parseResults = dispatcher.parse(
                 name + (args.length > 0 ? " " + String.join(" ", args) : ""),
                 source
         );
 
-        try {
+        locks.add(sender.getUniqueId());
-            dispatcher.execute(parseResults);
-        } catch (CommandSyntaxException e) {
-            sender.sendMessage(Component.text(e.getRawMessage().getString(), NamedTextColor.RED));
 
-            if (e.getInput() != null && e.getCursor() >= 0) {
+        this.plugin.getBootstrap().getScheduler().async().execute(() -> {
-                int j = Math.min(e.getInput().length(), e.getCursor());
+            try {
-
+                dispatcher.execute(parseResults);
-                Component msg = Component.empty().color(NamedTextColor.GRAY).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + name));
+            } catch (CommandSyntaxException e) {
-
+                this.sendError(sender, name, e);
-                if (j > 10) {
-                    msg = msg.append(Component.text("..."));
-                }
-
-                msg = msg.append(Component.text(e.getInput().substring(Math.max(0, j - 10), j)));
-
-                if (j < e.getInput().length()) {
-                    Component component = Component.text(e.getInput().substring(j)).color(NamedTextColor.RED).decorate(TextDecoration.UNDERLINED);
-                    msg = msg.append(component);
-                }
-
-                msg = msg.append(Component.translatable("command.context.here").color(NamedTextColor.RED).decorate(TextDecoration.ITALIC));
-                sender.sendMessage(msg);
             }
+        });
+    }
+
+    private void sendError(CommandSender sender, String name, CommandSyntaxException e) {
+        sender.sendMessage(Component.text(e.getRawMessage().getString(), NamedTextColor.RED));
+
+        if (e.getInput() != null && e.getCursor() >= 0) {
+            int j = Math.min(e.getInput().length(), e.getCursor());
+
+            Component msg = Component.empty().color(NamedTextColor.GRAY).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + name));
+
+            if (j > 10) {
+                msg = msg.append(Component.text("..."));
+            }
+
+            msg = msg.append(Component.text(e.getInput().substring(Math.max(0, j - 10), j)));
+
+            if (j < e.getInput().length()) {
+                Component component = Component.text(e.getInput().substring(j)).color(NamedTextColor.RED).decorate(TextDecoration.UNDERLINED);
+                msg = msg.append(component);
+            }
+
+            msg = msg.append(Component.translatable("command.context.here").color(NamedTextColor.RED).decorate(TextDecoration.ITALIC));
+            sender.sendMessage(msg);
         }
     }
 }

common/src/main/java/dev/xhyrom/lighteco/common/command/argument/type/OfflineUserArgument.java

@@ -18,10 +18,13 @@ public class OfflineUserArgument implements ArgumentType<String> {
         LightEcoPlugin plugin = context.getSource().plugin();
 
         UUID uniqueId = plugin.getBootstrap().lookupUniqueId(userName).orElse(null);
-        if (uniqueId == null) {
+        if (uniqueId == null || plugin.getCommandManager().getLocks().contains(uniqueId)) {
             return null;
         }
 
+        // Lock the user to prevent race conditions
+        plugin.getCommandManager().getLocks().add(uniqueId);
+
         return plugin.getUserManager().loadUser(uniqueId).join();
     }
 

common/src/main/java/dev/xhyrom/lighteco/common/config/message/CurrencyMessageConfig.java

@@ -17,7 +17,6 @@ public class CurrencyMessageConfig extends OkaeriConfig {
     public String payReceived = "<currency> <dark_gray>| <gray>Received <gold><amount> <yellow>from <gold><sender>";
     public String payReceivedWithTax = "<currency> <dark_gray>| <gray>Received <gold><amount> <yellow>from <gold><sender> <dark_gray>(<gold><taxed_amount> <yellow>after tax<dark_gray>)";
 
-    public String wait = "<red>Please wait a moment before using this command again.";
     public String notEnoughMoney = "<red>You don't have enough money!";
     public String cannotPaySelf = "<red>You cannot pay yourself!";
     public String cannotBeGreaterThan = "<red>Amount cannot be greater than <gold><max>";

common/src/main/java/dev/xhyrom/lighteco/common/config/message/MessageConfig.java

@@ -7,4 +7,6 @@ import java.util.Map;
 
 public class MessageConfig extends OkaeriConfig {
     public Map<String, CurrencyMessageConfig> currency = Collections.singletonMap("default", new CurrencyMessageConfig());
+
+    public String wait = "<red>Please wait a moment before using this command again.";
 }