summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 638c2e0b8..166282582 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -329,8 +329,6 @@ class HypixelData {
}
}
- if (!event.isMod(5)) return
-
if (!LorenzUtils.onHypixel) {
checkHypixel()
if (LorenzUtils.onHypixel) {
@@ -340,6 +338,8 @@ class HypixelData {
}
if (!LorenzUtils.onHypixel) return
+ if (!event.isMod(5)) return
+
val inSkyBlock = checkScoreboard()
if (inSkyBlock) {
checkIsland()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
index 08dd89539..c5f072587 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt
@@ -39,7 +39,7 @@ object ProfileStorageData {
val profileName = event.name
if (playerSpecific == null) {
DelayedRun.runDelayed(10.seconds) {
- workaroundIn10Seconds(profileName)
+ workaroundIn10SecondsProfileStorage(profileName)
}
ErrorManager.skyHanniError("playerSpecific is null in ProfileJoinEvent!")
}
@@ -51,7 +51,8 @@ object ProfileStorageData {
ConfigLoadEvent().postAndCatch()
}
- private fun workaroundIn10Seconds(profileName: String) {
+ private fun workaroundIn10SecondsProfileStorage(profileName: String) {
+ println("workaroundIn10SecondsProfileStorage")
val playerSpecific = playerSpecific
val sackPlayers = sackPlayers