Backend: Scoreboard Event lazy (#2835)

Co-authored-by: Empa <itsempa@users.noreply.github.com>
hannibal002 · Oct 27, 2024 · 6ff118b · 6ff118b
1 parent 4750db9
commit 6ff118b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -119,7 +119,7 @@ object ScoreboardData {
         if (new != sidebarLinesFormatted) {
             val old = sidebarLinesFormatted
             sidebarLinesFormatted = new
-            ScoreboardUpdateEvent(old, new).postAndCatch()
+            ScoreboardUpdateEvent(new, old).postAndCatch()
         }
     }
 

diff --git a/src/main/java/at/hannibal2/skyhanni/events/ScoreboardUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ScoreboardUpdateEvent.kt
@@ -1,10 +1,10 @@
 package at.hannibal2.skyhanni.events
 
 class ScoreboardUpdateEvent(
+    val full: List<String>,
     val old: List<String>,
-    val scoreboard: List<String>,
 ) : LorenzEvent() {
 
-    val added by lazy { scoreboard - old.toSet() }
-    val removed by lazy { old - scoreboard.toSet() }
+    val added: List<String> = full - old.toSet()
+    val removed: List<String> = old - full.toSet()
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
@@ -44,8 +44,8 @@ object SlayerQuestWarning {
 
     @SubscribeEvent
     fun onScoreboardChange(event: ScoreboardUpdateEvent) {
-        val slayerType = event.scoreboard.nextAfter("Slayer Quest")
-        val slayerProgress = event.scoreboard.nextAfter("Slayer Quest", skip = 2) ?: "no slayer"
+        val slayerType = event.full.nextAfter("Slayer Quest")
+        val slayerProgress = event.full.nextAfter("Slayer Quest", skip = 2) ?: "no slayer"
         val new = slayerProgress.removeColor()
         val slayerData = getSlayerData()