From 9e1016af6b119fb3064687b783c9e81af2d72f88 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Thu, 2 Mar 2023 22:31:36 +0100 Subject: Hopefully fixed getMultiplier for the last time --- src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt index 344cbd715..1a7175282 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt @@ -98,7 +98,7 @@ object NEUItems { Utils.disableCustomDungColours = false } - fun getMultiplier(rawId: String, tryCount: Int = 0, parent: String? = null): Pair { + fun getMultiplier(rawId: String, tryCount: Int = 0): Pair { if (multiplierCache.contains(rawId)) { return multiplierCache[rawId]!! } @@ -121,13 +121,13 @@ object NEUItems { if (map.size != 1) continue val current = map.iterator().next().toPair() val id = current.first - return if (id != parent) { - val child = getMultiplier(id, tryCount + 1, rawId) + return if (current.second > 1) { + val child = getMultiplier(id, tryCount + 1) val result = Pair(child.first, child.second * current.second) multiplierCache[rawId] = result result } else { - Pair(parent, 1) + Pair(rawId, 1) } } -- cgit