From 248258f556c2f76ce8939e1eb1a57e356961c079 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 4 May 2024 23:22:30 +1000
Subject: Fix: Filter out colour codes correctly (#1685)

---
 .../at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt | 3 ++-
 .../at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
index 759c675b1..927370cd5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt
@@ -17,6 +17,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.asTimeMark
 import at.hannibal2.skyhanni.utils.SimpleTimeMark.Companion.fromNow
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.TimeUtils.format
 import io.github.moulberry.notenoughupdates.util.SkyBlockTime
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -69,7 +70,7 @@ object HoppityEggsManager {
         eggFoundPattern.matchMatcher(event.message) {
             HoppityEggLocator.eggFound()
             val meal = getEggType(event)
-            val note = group("note")
+            val note = group("note").removeColor()
             meal.markClaimed()
             lastMeal = meal
             lastNote = note
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt
index 67aaf2008..6588fde5f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt
@@ -34,7 +34,7 @@ object HoppityEggsShared {
             val eggLocation = LorenzVec(x, y, z)
 
             val meal = getEggType(event)
-            val note = groupOrNull("note")?.removeColor()
+            val note = groupOrNull("note")
 
             if (meal.isClaimed()) return
             if (!HoppityEggLocator.isValidEggLocation(eggLocation)) return
-- 
cgit