diff options
| author | J10a1n15 <45315647+j10a1n15@users.noreply.github.com> | 2024-10-28 17:37:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-28 17:37:38 +0100 |
| commit | 2a8e5cf5912a540aeb7a3f2114be2630285ea14a (patch) | |
| tree | 0e5b2dbe6132cf9cb456df34b34d1ef4876b141c | |
| parent | 1a6f246e7c11b731ebca0780f62306fbb5aa141e (diff) | |
| download | SkyHanni-2a8e5cf5912a540aeb7a3f2114be2630285ea14a.tar.gz SkyHanni-2a8e5cf5912a540aeb7a3f2114be2630285ea14a.tar.bz2 SkyHanni-2a8e5cf5912a540aeb7a3f2114be2630285ea14a.zip | |
Fix: Old Mayor Perks being active (#2851)
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/ElectionAPI.kt | 1 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/MayorData.kt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ElectionAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/ElectionAPI.kt index 03a6a2e9c..baedbd16c 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ElectionAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ElectionAPI.kt @@ -231,6 +231,7 @@ object ElectionAPI { val currentMayorName = data.mayor.name if (lastMayor?.name != currentMayorName) { + Perk.resetPerks() currentMayor = setAssumeMayorJson(currentMayorName, data.mayor.perks) currentMinister = data.mayor.minister?.let { setAssumeMayorJson(it.name, listOf(it.perk)) } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorData.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorData.kt index 3d1558987..26246011f 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MayorData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MayorData.kt @@ -215,6 +215,8 @@ enum class Perk(val perkName: String) { override fun toString(): String = "$perkName: $description" companion object { + fun resetPerks() = entries.forEach { it.isActive = false } + fun getPerkFromName(name: String): Perk? = entries.firstOrNull { it.perkName == name } fun MayorPerk.toPerk(): Perk? = getPerkFromName(this.renameIfFoxyExtraEventPerkFound())?.let { |