From 5eaa87885d0954f73152abac6c0b4095a68a2847 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Thu, 16 Jun 2022 22:53:25 +0200
Subject: [PATCH] Hotfix SWCommand

---
 CommonCore                                    |  2 +-
 .../bungeecore/commands/RCommand.java         | 19 +++++++++++++------
 .../{Validator.java => TypeValidator.java}    |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)
 rename src/de/steamwar/command/{Validator.java => TypeValidator.java} (91%)

diff --git a/CommonCore b/CommonCore
index b1328695..09a9d898 160000
--- a/CommonCore
+++ b/CommonCore
@@ -1 +1 @@
-Subproject commit b1328695a1a30c062d066ff564a9112fde668b3e
+Subproject commit 09a9d8980b0186e7e5e17c14ef651a9684bc8651
diff --git a/src/de/steamwar/bungeecore/commands/RCommand.java b/src/de/steamwar/bungeecore/commands/RCommand.java
index 1ad2d6e2..fa69199b 100644
--- a/src/de/steamwar/bungeecore/commands/RCommand.java
+++ b/src/de/steamwar/bungeecore/commands/RCommand.java
@@ -19,8 +19,8 @@
 
 package de.steamwar.bungeecore.commands;
 
-import de.steamwar.bungeecore.Message;
 import de.steamwar.command.SWCommand;
+import de.steamwar.command.TypeValidator;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 import static de.steamwar.bungeecore.Storage.lastChats;
@@ -32,11 +32,18 @@ public class RCommand extends SWCommand {
     }
 
     @Register(description = "R_USAGE")
-    public void genericCommand(ProxiedPlayer player, String... message) {
-        if (message.length == 0) {
-            Message.send("R_USAGE", player);
-            return;
-        }
+    public void genericCommand(ProxiedPlayer player, @Validator String... message) {
         MsgCommand.msg(player, lastChats.get(player), message);
     }
+
+    @ClassValidator(String[].class)
+    public TypeValidator<String[]> getValidator() {
+        return (sender, value, messageSender) -> {
+            if (value.length == 0) {
+                messageSender.accept("R_USAGE", new Object[0]);
+                return false;
+            }
+            return true;
+        };
+    }
 }
diff --git a/src/de/steamwar/command/Validator.java b/src/de/steamwar/command/TypeValidator.java
similarity index 91%
rename from src/de/steamwar/command/Validator.java
rename to src/de/steamwar/command/TypeValidator.java
index f7bca350..6bb76f66 100644
--- a/src/de/steamwar/command/Validator.java
+++ b/src/de/steamwar/command/TypeValidator.java
@@ -21,5 +21,5 @@ package de.steamwar.command;
 
 import net.md_5.bungee.api.CommandSender;
 
-public interface Validator<T> extends AbstractValidator<CommandSender, T> {
+public interface TypeValidator<T> extends AbstractValidator<CommandSender, T> {
 }