From c1f2281db5df1868b50c73a6781ff5a79e8f0a37 Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Sun, 20 Oct 2024 23:49:37 +0200
Subject: Fix: Scoreboard Patterns (#2779)

---
 .../skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 42fc1a55e..f26ba1bf6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -109,9 +109,14 @@ object ScoreboardPattern {
 
     // dungeon scoreboard
     private val dungeonSb = scoreboardGroup.group("dungeon")
+
+    /**
+     * REGEX-TEST: §8- §c§4Power Dragon§a 497.3M§c❤
+     * REGEX-TEST: §8- §c§4Power Dragon§a 497.3M
+     */
     val m7dragonsPattern by dungeonSb.pattern(
         "m7dragons",
-        "§cNo Alive Dragons|§8- (?:§.)+[\\w\\s]+Dragon§a [\\w,.]+§.❤",
+        "§cNo Alive Dragons|§8- (?:§.)+[\\w\\s]+Dragon§a [\\w,.]+(?:§.❤)?",
     )
     val keysPattern by dungeonSb.pattern(
         "keys",
@@ -336,7 +341,7 @@ object ScoreboardPattern {
     )
     val bossHealthBarPattern by combatSb.pattern(
         "magmabosshealthbar",
-        "§.(?:\\d+(?:\\.\\d)?M|\\d+k)§f/§a10M§c❤",
+        "§.[\\w,.]+§f/§a10M§c❤",
     )
     val bossHPPattern by combatSb.pattern(
         "bosshp",
-- 
cgit