aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorCalMWolfs <94038482+CalMWolfs@users.noreply.github.com>2024-03-27 03:01:45 +1100
committerGitHub <noreply@github.com>2024-03-26 17:01:45 +0100
commit6582eefb98545c6c05430e7205e2c6e6c012169d (patch)
tree24bb712b5cfc833d813d13a0b122c85a0db39667 /src/main/java
parentd5b4ff06e4f48954004fa6c7449341308883a6ec (diff)
downloadskyhanni-6582eefb98545c6c05430e7205e2c6e6c012169d.tar.gz
skyhanni-6582eefb98545c6c05430e7205e2c6e6c012169d.tar.bz2
skyhanni-6582eefb98545c6c05430e7205e2c6e6c012169d.zip
Fix: More server id errors (#1271)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 3e8d0b756..9ab6993d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -44,7 +44,7 @@ class HypixelData {
private val patternGroup = RepoPattern.group("data.hypixeldata")
private val serverIdScoreboardPattern by patternGroup.pattern(
"serverid.scoreboard",
- "§7\\d+/\\d+/\\d+ §8(?<servertype>[mM])(?<serverid>\\S+)"
+ "§7\\d+/\\d+/\\d+ §8(?<servertype>[mM])(?<serverid>\\S+).*"
)
private val serverIdTablistPattern by patternGroup.pattern(
"serverid.tablist",
@@ -120,6 +120,7 @@ class HypixelData {
fun checkCurrentServerId() {
if (!LorenzUtils.inSkyBlock) return
if (LorenzUtils.lastWorldSwitch.passedSince() < 1.seconds) return
+ if (!TabListData.fullyLoaded) return
ScoreboardData.sidebarLinesFormatted.forEach {
serverIdScoreboardPattern.matchMatcher(it) {