aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 55ab2dd35..024733446 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -283,6 +283,7 @@ class HypixelData {
}
@SubscribeEvent
+ // TODO rewrite everything in here
fun onTick(event: LorenzTickEvent) {
if (!LorenzUtils.inSkyBlock) {
// Modified from NEU.
@@ -302,17 +303,19 @@ class HypixelData {
}
}
- if (LorenzUtils.inSkyBlock) {
- loop@ for (line in ScoreboardData.sidebarLinesFormatted) {
- skyblockAreaPattern.matchMatcher(line) {
- val originalLocation = group("area")
- skyBlockArea = LocationFixData.fixLocation(skyBlockIsland) ?: originalLocation
- skyBlockAreaWithSymbol = line.trim()
- break@loop
+ if (LorenzUtils.onHypixel) {
+ if (LorenzUtils.inSkyBlock) {
+ loop@ for (line in ScoreboardData.sidebarLinesFormatted) {
+ skyblockAreaPattern.matchMatcher(line) {
+ val originalLocation = group("area")
+ skyBlockArea = LocationFixData.fixLocation(skyBlockIsland) ?: originalLocation
+ skyBlockAreaWithSymbol = line.trim()
+ break@loop
+ }
}
- }
- checkProfileName()
+ checkProfileName()
+ }
}
if (!event.isMod(5)) return