From a2e8ba70ff1f6681cfd0fad8a411712b8c707ce6 Mon Sep 17 00:00:00 2001
From: noil <robloxguy@protonmail.com>
Date: Fri, 15 Jan 2021 22:09:08 -0500
Subject: [PATCH] ChatFilter: Only filters on 2b2t & 9b9t

---
 .../impl/module/misc/ChatFilterModule.java    | 76 +++++++++----------
 1 file changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatFilterModule.java b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatFilterModule.java
index fd77dda..9033658 100644
--- a/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatFilterModule.java
+++ b/src/main/java/me/rigamortis/seppuku/impl/module/misc/ChatFilterModule.java
@@ -53,41 +53,53 @@ public final class ChatFilterModule extends Module {
                     }
                 }
 
-                if (this.death.getValue()) {
-                    if (packet.getChatComponent().getFormattedText().contains("\2474") || packet.getChatComponent().getFormattedText().contains("\247c")) {
-                        event.setCanceled(true);
-                    }
-                }
-
-                if (this.broadcasts.getValue()) {
-                    if (packet.getChatComponent().getFormattedText().startsWith("\2475[SERVER]")) {
-                        event.setCanceled(true);
+                if (is9b9tOr2b2t) {
+                    if (this.death.getValue()) {
+                        if (packet.getChatComponent().getFormattedText().contains("\2474") || packet.getChatComponent().getFormattedText().contains("\247c")) {
+                            event.setCanceled(true);
+                        }
                     }
 
-                    if (is9b9tOr2b2t) {
+                    if (this.broadcasts.getValue()) {
+                        if (packet.getChatComponent().getFormattedText().startsWith("\2475[SERVER]")) {
+                            event.setCanceled(true);
+                        }
+
                         if (packet.getChatComponent().getFormattedText().contains("\2472")) {
                             event.setCanceled(true);
                         }
                     }
-                }
 
-                if (this.spam.getValue()) {
-                    final String chat = packet.getChatComponent().getUnformattedText();
+                    if (this.spam.getValue()) {
+                        final String chat = packet.getChatComponent().getUnformattedText();
 
-                    if (this.cache.size() > 0) {
-                        for (String s : this.cache) {
-                            final double diff = StringUtil.levenshteinDistance(s, chat);
+                        if (this.cache.size() > 0) {
+                            for (String s : this.cache) {
+                                final double diff = StringUtil.levenshteinDistance(s, chat);
 
-                            if (diff >= 0.75f) {
-                                event.setCanceled(true);
+                                if (diff >= 0.75f) {
+                                    event.setCanceled(true);
+                                }
                             }
                         }
+
+                        this.cache.add(chat);
+
+                        if (this.cache.size() >= 10) {
+                            this.cache.remove(0);
+                        }
                     }
 
-                    this.cache.add(chat);
+                    if (this.blue.getValue()) {
+                        if (packet.getChatComponent().getFormattedText().contains(ChatFormatting.BLUE + "")) {
+                            event.setCanceled(true);
+                        }
+                    }
 
-                    if (this.cache.size() >= 10) {
-                        this.cache.remove(0);
+                    if (this.green.getValue()) {
+                        if (packet.getChatComponent().getFormattedText().contains(ChatFormatting.GREEN + "")) {
+                            event.setCanceled(true);
+                        }
                     }
                 }
 
@@ -100,19 +112,15 @@ public final class ChatFilterModule extends Module {
                         boolean containsUnicode = false;
 
                         for (String s : component.getFormattedText().split(" ")) {
-
-                            String line = "";
-
+                            StringBuilder line = new StringBuilder();
                             for (char c : s.toCharArray()) {
                                 if (c >= 0xFEE0) {
                                     c -= 0xFEE0;
                                     containsUnicode = true;
                                 }
-
-                                line += c;
+                                line.append(c);
                             }
-
-                            sb.append(line + " ");
+                            sb.append(line).append(" ");
                         }
 
                         if (containsUnicode) {
@@ -120,18 +128,6 @@ public final class ChatFilterModule extends Module {
                         }
                     }
                 }
-
-                if (this.blue.getValue()) {
-                    if (packet.getChatComponent().getFormattedText().contains(ChatFormatting.BLUE + "")) {
-                        event.setCanceled(true);
-                    }
-                }
-
-                if (this.green.getValue()) {
-                    if (packet.getChatComponent().getFormattedText().contains(ChatFormatting.GREEN + "")) {
-                        event.setCanceled(true);
-                    }
-                }
             }
         }
     }