From 238085dd49de8bca06ed816bc7a8d369390cdf30 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Tue, 29 Aug 2023 17:08:20 +0200 Subject: code cleanup --- src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt | 3 +-- src/main/java/at/hannibal2/skyhanni/events/SackChangeEvent.kt | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt index 4efb30727..3990e13d6 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt @@ -17,8 +17,6 @@ class SackAPI { fun onChat(event: LorenzChatEvent) { if (!event.message.removeColor().startsWith("[Sacks]")) return - val sackChanges = ArrayList() - val sackAddText = event.chatComponent.siblings.firstNotNullOfOrNull { sibling -> sibling.chatStyle?.chatHoverEvent?.value?.formattedText?.removeColor()?.takeIf { it.startsWith("Added") @@ -36,6 +34,7 @@ class SackAPI { val otherItemsAdded = sackAddText.contains("other items") val otherItemsRemoved = sackRemoveText.contains("other items") + val sackChanges = ArrayList() for (match in sackChangeRegex.findAll(sackChangeText)) { val delta = match.groups[1]!!.value.replace(",", "").toInt() val item = match.groups[2]!!.value diff --git a/src/main/java/at/hannibal2/skyhanni/events/SackChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SackChangeEvent.kt index 797605e80..b2006bc0d 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SackChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SackChangeEvent.kt @@ -2,6 +2,8 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.data.SackAPI -class SackChangeEvent(val sackChanges: List, - val otherItemsAdded: Boolean, - val otherItemsRemoved: Boolean) : LorenzEvent() +class SackChangeEvent( + val sackChanged: List, + val otherItemsAdded: Boolean, + val otherItemsRemoved: Boolean +) : LorenzEvent() -- cgit