diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-01-13 19:54:17 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-01-13 19:54:17 +0100 |
| commit | 4e2feb0fd1600ad325626fc7ca602cee034e94dc (patch) | |
| tree | 474e035e281ef15a2aedfb846dd79a767e66309c /src/main/java/at/hannibal2/skyhanni/features | |
| parent | 3b75c008598f57fa7f86b3ebabed6ade09d8238a (diff) | |
| parent | 213b88b9cfb5a79553651f7db7257415ca915f20 (diff) | |
| download | SkyHanni-4e2feb0fd1600ad325626fc7ca602cee034e94dc.tar.gz SkyHanni-4e2feb0fd1600ad325626fc7ca602cee034e94dc.tar.bz2 SkyHanni-4e2feb0fd1600ad325626fc7ca602cee034e94dc.zip | |
Merge branch 'dev' into crimson_isle_reputation
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt index 200c3e69e..a496bd2b5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt @@ -47,8 +47,8 @@ class BazaarBestSellMethod { for (slot in chest.inventorySlots) { if (slot == null) continue if (slot.slotNumber == slot.slotIndex) continue - if (slot.stack == null) continue - val stack = slot.stack + val stack = slot.stack ?: continue + var displayName = stack.displayName if (displayName.endsWith("Enchanted Book")) { displayName = stack.getLore()[0] diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt index 9118ac6a2..aca78fd0a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbility.kt @@ -74,7 +74,7 @@ enum class ItemAbility( } else { duration /= 1000 duration++ - LorenzUtils.formatInteger(duration.toInt()) + LorenzUtils.formatInteger(duration) } } |