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/SlayerAPI.kt8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
index 1c5c76d92..7e44bd5cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
@@ -27,7 +27,7 @@ object SlayerAPI {
var questStartTime = 0L
var isInSlayerArea = false
- private var latestSlayerCategory = ""
+ var latestSlayerCategory = ""
private var latestProgressChangeTime = 0L
var latestWrongAreaWarning = 0L
private var latestSlayerProgress = ""
@@ -106,10 +106,14 @@ object SlayerAPI {
if (event.phase != TickEvent.Phase.START) return
if (!LorenzUtils.inSkyBlock) return
+ // wait with sending SlayerChangeEvent until profile is detected
+ if (ProfileStorageData.profileSpecific == null) return
+
val slayerQuest = ScoreboardData.sidebarLinesFormatted.nextAfter("Slayer Quest") ?: ""
if (slayerQuest != latestSlayerCategory) {
- SlayerChangeEvent(latestSlayerCategory, slayerQuest).postAndCatch()
+ val old = latestSlayerCategory
latestSlayerCategory = slayerQuest
+ SlayerChangeEvent(old, latestSlayerCategory).postAndCatch()
}
val slayerProgress = ScoreboardData.sidebarLinesFormatted.nextAfter("Slayer Quest", 2) ?: ""