aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ10a1n15 <45315647+j10a1n15@users.noreply.github.com>2024-09-18 09:31:04 +0200
committerGitHub <noreply@github.com>2024-09-18 09:31:04 +0200
commitff1d69d6238b6898dfe4f7c9986661a0737a2100 (patch)
treeba9f9f6501d56a921f7c68419484d8a904fe1ae8
parent532e748e8e65d8435c5bcc7939f950a0e05a3de7 (diff)
downloadskyhanni-ff1d69d6238b6898dfe4f7c9986661a0737a2100.tar.gz
skyhanni-ff1d69d6238b6898dfe4f7c9986661a0737a2100.tar.bz2
skyhanni-ff1d69d6238b6898dfe4f7c9986661a0737a2100.zip
Fix: Custom Scoreboard Errors (#2531)
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt13
1 files changed, 11 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 1c6fb4282..0324da855 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
@@ -274,8 +274,13 @@ object ScoreboardPattern {
"uselessgoblin",
"^§7Kill goblins!$",
)
+
+ /**
+ * REGEX-TEST: Remaining: §a1 goblin
+ * REGEX-TEST: Remaining: §a2 goblins
+ */
val remainingGoblinPattern by miningSb.pattern(
- "remaininggoblin", "^Remaining: §a\\d+ goblins$",
+ "remaininggoblin", "^Remaining: §a\\d+ goblins?$",
)
val yourGoblinKillsPattern by miningSb.pattern(
"yourgoblin", "^Your kills: §c\\d+ ☠( §a\\(\\+\\d+\\))?$",
@@ -303,9 +308,13 @@ object ScoreboardPattern {
"magmaboss",
"^§7Boss: §[c6e]\\d{1,3}%$",
)
+
+ /**
+ * REGEX-TEST: §7Damage Soaked:§629,446 §e(+271
+ */
val damageSoakedPattern by combatSb.pattern(
"damagesoaked",
- "^§7Damage Soaked:",
+ "^§7Damage Soaked:.*",
)
val killMagmasPattern by combatSb.pattern(
"killmagmas",