From 672de54b26c4316ab05c630b25a412610d9b2aa9 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Mon, 21 Aug 2023 19:47:07 +0700
Subject: [PATCH] some more fix

---
 .../chayapak/chomens_bot/plugins/AuthPlugin.java      | 11 ++++++++---
 .../chayapak/chomens_bot/plugins/ChatPlugin.java      |  8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/AuthPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/AuthPlugin.java
index 557863ae..d217d908 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/AuthPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/AuthPlugin.java
@@ -45,6 +45,10 @@ public class AuthPlugin extends PlayersPlugin.Listener {
     public void playerJoined(PlayerEntry target) {
         if (!target.profile.getName().equals(bot.config.ownerName) || !bot.options.useCore) return;
 
+        bot.executor.schedule(() -> sendVerificationMessage(target), 2, TimeUnit.SECONDS);
+    }
+
+    public void sendVerificationMessage (PlayerEntry entry) {
         started = true;
 
         final long currentTime = System.currentTimeMillis();
@@ -63,7 +67,7 @@ public class AuthPlugin extends PlayersPlugin.Listener {
                         .text(id)
                         .append(Component.text(hash))
                         .append(Component.text(UUIDUtilities.selector(bot.profile.getId()))), // convenient reason
-                target.profile.getId()
+                entry.profile.getId()
         );
     }
 
@@ -72,6 +76,7 @@ public class AuthPlugin extends PlayersPlugin.Listener {
         if (!target.profile.getName().equals(bot.config.ownerName)) return;
 
         hasCorrectHash = false;
+        started = false;
     }
 
     private void systemMessageReceived (Component component) {
@@ -98,8 +103,6 @@ public class AuthPlugin extends PlayersPlugin.Listener {
                     .toString()
                     .substring(0, 8);
 
-            bot.logger.info("Input: " + inputHash + " Real Hash: " + hash);
-
             hasCorrectHash = inputHash.equals(hash);
         } catch (Exception ignored) {}
     }
@@ -113,6 +116,8 @@ public class AuthPlugin extends PlayersPlugin.Listener {
 
         final long timeSinceJoined = System.currentTimeMillis() - timeJoined;
 
+        if (!hasCorrectHash) sendVerificationMessage(entry);
+
         if (timeSinceJoined > bot.config.ownerAuthentication.timeout && !hasCorrectHash) {
             bot.filter.mute(entry, "Not verified");
             bot.filter.deOp(entry);
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java
index 36a95cdc..7653d26d 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java
@@ -91,19 +91,19 @@ public class ChatPlugin extends Bot.Listener {
             if (playerMessage != null) break;
         }
 
-        boolean isCommandSuggestions = false;
+        boolean ignore = false;
         if (component instanceof TextComponent t_component) {
             final String id = t_component.content();
 
-            if (id.equals(bot.commandSuggestion.id)) isCommandSuggestions = true;
+            if (id.equals(bot.commandSuggestion.id) || id.equals(bot.auth.id)) ignore = true;
         }
 
         final String string = ComponentUtilities.stringify(component);
         final String ansi = ComponentUtilities.stringifyAnsi(component);
 
         for (Listener listener : listeners) {
-            if (!isCommandSuggestions) listener.systemMessageReceived(component, string, ansi);
-            listener.systemMessageReceived(component, isCommandSuggestions, string, ansi);
+            if (!ignore) listener.systemMessageReceived(component, string, ansi);
+            listener.systemMessageReceived(component, ignore, string, ansi);
 
             if (playerMessage != null) listener.playerMessageReceived(playerMessage);
         }