diff options
3 files changed, 7 insertions, 8 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt index d0524fd4d..58ca7ef4f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt @@ -399,13 +399,11 @@ private fun getIslandDisplayPair() = listOf("§7㋖ §a" + HypixelData.skyBlockIsland.displayName to HorizontalAlignment.LEFT) private fun getLocationDisplayPair() = buildList { - add( - getGroupFromPattern( - ScoreboardData.sidebarLinesFormatted, - ScoreboardPattern.locationPattern, - "location" - ).trim() to HorizontalAlignment.LEFT - ) + val location = + getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.locationPattern, "location").trim() + if (location == "0") return@buildList + + add(location to HorizontalAlignment.LEFT) ScoreboardData.sidebarLinesFormatted.firstOrNull { ScoreboardPattern.plotPattern.matches(it) } ?.let { add(it to HorizontalAlignment.LEFT) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvents.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvents.kt index dfe5a0d3a..636433ccc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvents.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvents.kt @@ -190,7 +190,7 @@ private fun getDungeonsLines() = listOf( SbPattern.floor3GuardiansPattern ).let { patterns -> // BetterMap adds a random §r at the start, making it go black - getSbLines().filter { line -> patterns.any { it.matches(line.replace("§r", "")) } } + getSbLines().filter { line -> patterns.any { it.matches(line) } }.map { it.removePrefix("§r") } } private fun getDungeonsShowWhen(): Boolean { diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt index 397aa713a..3c77cd248 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt @@ -43,6 +43,7 @@ object UnknownLinesHandler { SbPattern.soloPattern, SbPattern.teammatesPattern, SbPattern.floor3GuardiansPattern, + SbPattern.m7dragonsPattern, SbPattern.wavePattern, SbPattern.tokensPattern, SbPattern.submergesPattern, |