diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index eb38187ca..9eb2aa5e7 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -117,26 +117,30 @@ class HypixelData { val mode get() = locraw["mode"] ?: "" val map get() = locraw["map"] ?: "" - fun getCurrentServerId(): String? { - if (!LorenzUtils.inSkyBlock) return null - if (serverId != null) return serverId + fun checkCurrentServerId() { + if (!LorenzUtils.inSkyBlock) return ScoreboardData.sidebarLinesFormatted.forEach { serverIdScoreboardPattern.matchMatcher(it) { val serverType = if (group("servertype") == "M") "mega" else "mini" serverId = "$serverType${group("serverid")}" - return serverId + return } } TabListData.getTabList().forEach { serverIdTablistPattern.matchMatcher(it) { serverId = group("serverid") - return serverId + return } } - return serverId + ErrorManager.logErrorWithData( + Exception("NoServerId"), "Could not find server id", + "islandType" to LorenzUtils.skyBlockIsland, + "tablist" to TabListData.getTabList(), + "scoreboard" to ScoreboardData.sidebarLinesFormatted + ) } fun getPlayersOnCurrentServer(): Int { @@ -303,7 +307,7 @@ class HypixelData { if (inSkyBlock) { checkIsland() checkSidebar() - getCurrentServerId() + checkCurrentServerId() } if (inSkyBlock == skyBlock) return |