diff options
author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2023-06-23 08:19:22 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-23 08:19:22 +1000 |
commit | 649e7ecd4c601d05d51c1decab91675e77e99ef9 (patch) | |
tree | 600a2c6abf4298a602df747591f1064bdbe4029f /src/main/java/at/hannibal2/skyhanni/features/bazaar | |
parent | 34e7fe2a360da747750b90c7f11a136e5513d1d8 (diff) | |
parent | 46968a541e2231caadd9a9fc471277054bd012cd (diff) | |
download | skyhanni-649e7ecd4c601d05d51c1decab91675e77e99ef9.tar.gz skyhanni-649e7ecd4c601d05d51c1decab91675e77e99ef9.tar.bz2 skyhanni-649e7ecd4c601d05d51c1decab91675e77e99ef9.zip |
Merge branch 'hannibal002:beta' into frozen_treasure_tracker
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/bazaar')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt index 5e2321e24..e6f646ef1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataHolder.kt @@ -48,8 +48,13 @@ class BazaarDataHolder { fun getData(internalName: String) = bazaarData[internalName] ?: createNewData(internalName) - private fun createNewData(internalName: String): BazaarData { - val displayName = NEUItems.getItemStack(internalName).name!!.removeColor() + private fun createNewData(internalName: String): BazaarData? { + val stack = NEUItems.getItemStackOrNull(internalName) + if (stack == null) { + LorenzUtils.debug("Bazaar data is null: '$internalName'") + return null + } + val displayName = stack.name!!.removeColor() val sellPrice = NEUItems.getPrice(internalName, true) val buyPrice = NEUItems.getPrice(internalName, false) val npcPrice = npcPrices[internalName].let { |