From a40192ac3ffe9515f2f3f26a2b8cc899d2bac410 Mon Sep 17 00:00:00 2001 From: Internet Yamero <119892303+AC19970@users.noreply.github.com> Date: Sun, 2 Feb 2025 05:46:09 +0900 Subject: Update Combofilter (#1148) * Update ComboFilter.java * Update ComboFilterTest.java --- .../java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilter.java | 4 ++-- .../de/hysky/skyblocker/skyblock/chat/filters/ComboFilterTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilter.java index d71085db..ff9f4efb 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilter.java @@ -5,8 +5,8 @@ import de.hysky.skyblocker.utils.chat.ChatFilterResult; public class ComboFilter extends SimpleChatFilter { public ComboFilter() { - // ^(\+\d+ Kill Combo( \+\d+(✯ Magic Find| coins per kill|☯ Combat Wisdom))?|Your Kill Combo has expired! You reached a \d+ Kill Combo!)$ - super("^(\\+\\d+ Kill Combo( \\+\\d+(✯ Magic Find| coins per kill|☯ Combat Wisdom))?|Your Kill Combo has expired! You reached a \\d+ Kill Combo!)$"); + // ^(\+\d+ Kill Combo( \+\d+(% ✯ Magic Find| coins per kill|☯ Combat Wisdom))?|Your Kill Combo has expired! You reached a \d+ Kill Combo!)$ + super("^(\\+\\d+ Kill Combo( \\+\\d+(% ✯ Magic Find| coins per kill|☯ Combat Wisdom))?|Your Kill Combo has expired! You reached a \\d+ Kill Combo!)$"); } @Override diff --git a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilterTest.java index ff486908..7e91db16 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilterTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilterTest.java @@ -9,7 +9,7 @@ public class ComboFilterTest extends ChatFilterTest { @Test void testComboMF() { - assertMatches("+5 Kill Combo +3✯ Magic Find"); + assertMatches("+5 Kill Combo +3% ✯ Magic Find"); } @Test -- cgit