From 7b93762e70033c0dcfd1108477f62955eaa13f3b Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Thu, 1 Jun 2023 18:14:21 +0700
Subject: [PATCH] some stuff when chipmunk was on vacation too lazy to list the
 stuff just check the diff,..,.,

---
 src/main/java/land/chipmunk/chayapak/chomens_bot/Bot.java  | 2 ++
 .../chayapak/chomens_bot/plugins/FilterPlugin.java         | 4 ++--
 .../chayapak/chomens_bot/plugins/GrepLogPlugin.java        | 2 +-
 .../chayapak/chomens_bot/plugins/LoggerPlugin.java         | 2 +-
 .../chipmunk/chayapak/chomens_bot/{ => util}/Logger.java   | 7 ++++---
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename src/main/java/land/chipmunk/chayapak/chomens_bot/{ => util}/Logger.java (97%)

diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/Bot.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/Bot.java
index 12ff2077..6f96eb8c 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/Bot.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/Bot.java
@@ -119,6 +119,8 @@ public class Bot {
     }
 
     private void reconnect () {
+        if (session != null) session = null; // does this do nothing?
+
         for (Listener listener : listeners) {
             listener.connecting();
         }
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/FilterPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/FilterPlugin.java
index be124b6b..abe6a3f3 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/FilterPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/FilterPlugin.java
@@ -38,10 +38,10 @@ public class FilterPlugin extends PlayersPlugin.Listener {
             if (_filteredPlayer.regex) {
                 Pattern pattern = null;
                 if (_filteredPlayer.ignoreCase) {
-                    pattern = Pattern.compile("\\b" + _filteredPlayer.playerName + "\\b", Pattern.CASE_INSENSITIVE);
+                    pattern = Pattern.compile(_filteredPlayer.playerName, Pattern.CASE_INSENSITIVE);
                 } else {
                     try {
-                        pattern = Pattern.compile("\\b" + _filteredPlayer.playerName + "\\b");
+                        pattern = Pattern.compile(_filteredPlayer.playerName);
                     } catch (Exception e) {
                         bot.chat().tellraw(Component.text(e.toString()).color(NamedTextColor.RED));
                     }
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/GrepLogPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/GrepLogPlugin.java
index 1343dc12..f691a49b 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/GrepLogPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/GrepLogPlugin.java
@@ -1,7 +1,7 @@
 package land.chipmunk.chayapak.chomens_bot.plugins;
 
 import land.chipmunk.chayapak.chomens_bot.Bot;
-import land.chipmunk.chayapak.chomens_bot.Logger;
+import land.chipmunk.chayapak.chomens_bot.util.Logger;
 import land.chipmunk.chayapak.chomens_bot.util.ColorUtilities;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/LoggerPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/LoggerPlugin.java
index 3f27e041..a0aace48 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/LoggerPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/LoggerPlugin.java
@@ -3,7 +3,7 @@ package land.chipmunk.chayapak.chomens_bot.plugins;
 import com.github.steveice10.packetlib.event.session.ConnectedEvent;
 import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
 import land.chipmunk.chayapak.chomens_bot.Bot;
-import land.chipmunk.chayapak.chomens_bot.Logger;
+import land.chipmunk.chayapak.chomens_bot.util.Logger;
 import land.chipmunk.chayapak.chomens_bot.util.ComponentUtilities;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/Logger.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/util/Logger.java
similarity index 97%
rename from src/main/java/land/chipmunk/chayapak/chomens_bot/Logger.java
rename to src/main/java/land/chipmunk/chayapak/chomens_bot/util/Logger.java
index f7e6c86b..85ff0192 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/Logger.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/util/Logger.java
@@ -1,4 +1,6 @@
-package land.chipmunk.chayapak.chomens_bot;
+package land.chipmunk.chayapak.chomens_bot.util;
+
+import land.chipmunk.chayapak.chomens_bot.Main;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -6,7 +8,6 @@ import java.nio.file.Files;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPInputStream;
@@ -24,7 +25,7 @@ public class Logger {
     public static String prevEntry = "";
     public static int duplicateCounter = 1;
 
-    public static ScheduledExecutorService executor = Executors.newScheduledThreadPool(2);
+    public static ScheduledExecutorService executor = Main.executor;
     public static int spamLevel = 0;
     public static long freezeTime = 0;