diff options
| author | Empa <42304516+ItsEmpa@users.noreply.github.com> | 2024-10-27 12:48:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-27 12:48:37 +0100 |
| commit | 6ff118b5211031743ef929e3b5ef2a2c3f06f12d (patch) | |
| tree | 65e8b2e0d0ea13dfb4def671d7e9dc200a061672 | |
| parent | 4750db953c4bec0b3fb22b1f57633a7cf3f1dc71 (diff) | |
| download | SkyHanni-6ff118b5211031743ef929e3b5ef2a2c3f06f12d.tar.gz SkyHanni-6ff118b5211031743ef929e3b5ef2a2c3f06f12d.tar.bz2 SkyHanni-6ff118b5211031743ef929e3b5ef2a2c3f06f12d.zip | |
Backend: Scoreboard Event lazy (#2835)
Co-authored-by: Empa <itsempa@users.noreply.github.com>
3 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt index 7b40e6d6b..cf2e93a9d 100644 --- 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 index 59fb9493c..e2efcbaf2 100644 --- 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 index c879c202b..ecfc43923 100644 --- 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() |