diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-28 19:11:40 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-28 19:11:40 +0200 |
| commit | 7eb3e77e5ce50989af3cd4ab2b196fb0df76e168 (patch) | |
| tree | 2036c9b99d2475f546481ad88ab48091ba59c249 /src/main/java/at/hannibal2/skyhanni/data | |
| parent | 76c81de8442ccf2726abeecb8a73c0c6cab054db (diff) | |
| download | skyhanni-7eb3e77e5ce50989af3cd4ab2b196fb0df76e168.tar.gz skyhanni-7eb3e77e5ce50989af3cd4ab2b196fb0df76e168.tar.bz2 skyhanni-7eb3e77e5ce50989af3cd4ab2b196fb0df76e168.zip | |
Removing npc price from bazaar data and Fixed multiple bugs with garden visitor
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt index 62e151d2f..3a3bd8b33 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt @@ -1,7 +1,6 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.* -import at.hannibal2.skyhanni.features.bazaar.BazaarApi.Companion.getBazaarData import at.hannibal2.skyhanni.features.slayer.SlayerType import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.ItemUtils.nameWithEnchantment @@ -9,6 +8,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.nextAfter import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NEUItems.getItemStack +import at.hannibal2.skyhanni.utils.NEUItems.getNpcPriceOrNull import at.hannibal2.skyhanni.utils.NEUItems.getPrice import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.StringUtils.removeColor @@ -67,7 +67,7 @@ object SlayerAPI { val displayName = getNameWithEnchantmentFor(internalName) val price = internalName.getPrice() - val npcPrice = internalName.getBazaarData()?.npcPrice ?: 0.0 + val npcPrice = internalName.getNpcPriceOrNull() ?: 0.0 val maxPrice = npcPrice.coerceAtLeast(price) val totalPrice = maxPrice * amount |