From 3502c82b189d2f216a62504a1bff9962e4cb6fc0 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Wed, 12 Jul 2023 20:21:54 -0400
Subject: Fix ads filter to work with emblems

---
 src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java     | 4 ++--
 src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java
index 67734438..6b681d4c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java
@@ -18,8 +18,8 @@ public class AdFilter extends ChatPatternListener {
 		// Groups:
 		// 1. Player name
 		// 2. Message
-		// (?:§8\[[§fadbc0-9]+§8\] )?§[67abc](?:\[[§A-Za-z0-9+]+\] )?([A-Za-z0-9_]+)§[f7]: (.+)
-		super("(?:§8\\[[§fadbc0-9]+§8\\] )?§[67abc](?:\\[[§A-Za-z0-9+]+\\] )?([A-Za-z0-9_]+)§[f7]: (.+)");
+		// (?:§8\[[§feadbc0-9]+§8\] )?(?:.+ )?§[67abc](?:\[[§A-Za-z0-9+]+\] )?([A-Za-z0-9_]+)§[f7]: (.+)
+		super("(?:§8\\[[§feadbc0-9]+§8\\] )?(?:.+ )?§[67abc](?:\\[[§A-Za-z0-9+]+\\] )?([A-Za-z0-9_]+)§[f7]: (.+)");
 	}
 
 	@Override
diff --git a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java
index a769dca2..8a776ab7 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java
+++ b/src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java
@@ -24,7 +24,7 @@ class AdFilterTest extends ChatPatternListenerTest<AdFilter> {
 
     @Test
     void mvp() {
-        assertMatches("§8[§d256§8] §b[MVP§c+§b] Advertiser§f: advertisement");
+        assertMatches("§8[§d256§8] §6§l⚡ §b[MVP§c+§b] Advertiser§f: advertisement");
     }
 
     @Test
@@ -39,7 +39,7 @@ class AdFilterTest extends ChatPatternListenerTest<AdFilter> {
 
     @Test
     void simpleAd() {
-        assertFilters("§8[§c320§8] §b[MVP§c+§b] b2dderr§f: buying prismapump");
+        assertFilters("§8[§e320§8] §b[MVP§c+§b] b2dderr§f: buying prismapump");
     }
 
     @Test
-- 
cgit