diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-05-04 23:22:30 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-04 15:22:30 +0200 |
| commit | 248258f556c2f76ce8939e1eb1a57e356961c079 (patch) | |
| tree | 6114a0c34457cf08f6bf08050b6d2bfe6dec149b /src/main | |
| parent | a7e7c5eec1b90deb8a5c6d0166ccdd2e157f18b9 (diff) | |
| download | skyhanni-248258f556c2f76ce8939e1eb1a57e356961c079.tar.gz skyhanni-248258f556c2f76ce8939e1eb1a57e356961c079.tar.bz2 skyhanni-248258f556c2f76ce8939e1eb1a57e356961c079.zip | |
Fix: Filter out colour codes correctly (#1685)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt | 3 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsShared.kt | 2 |
2 files changed, 3 insertions, 2 deletions
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 |