aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-09-17 08:57:14 +0200
committerGitHub <noreply@github.com>2024-09-17 08:57:14 +0200
commitbae0275fc7b176c58c53b827e6b717aec351854f (patch)
treeda81d43e07baf306f5d5d5cf0be925d1ca22b3c9 /src/main/java
parent2e959c27fa0e0ec75bf26456df9ba80d2a8e5e5b (diff)
downloadskyhanni-bae0275fc7b176c58c53b827e6b717aec351854f.tar.gz
skyhanni-bae0275fc7b176c58c53b827e6b717aec351854f.tar.bz2
skyhanni-bae0275fc7b176c58c53b827e6b717aec351854f.zip
Fix: Corpse Tracker visiblility (#2516)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
index c54315d7e..f1d23185f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/glacitemineshaft/CorpseTracker.kt
@@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.mining.glacitemineshaft
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.data.IslandType
+import at.hannibal2.skyhanni.data.MiningAPI
import at.hannibal2.skyhanni.events.GuiRenderEvent
import at.hannibal2.skyhanni.events.IslandChangeEvent
import at.hannibal2.skyhanni.events.mining.CorpseLootedEvent
@@ -82,8 +83,8 @@ object CorpseTracker {
if (bucketData.getCorpseCount() == 0L) return@buildList
var profit = tracker.drawItems(bucketData, { true }, this)
- val applicableKeys: List<CorpseType> = bucketData.getSelectedBucket()?.let { listOf(it) }
- ?: enumValues<CorpseType>().toList().filter { bucketData.corpsesLooted[it] != null }
+ val applicableKeys: List<CorpseType> = bucketData.getSelectedBucket()?.let { listOf(it) } ?: enumValues<CorpseType>().toList()
+ .filter { bucketData.corpsesLooted[it] != null }
var totalKeyCost = 0.0
var totalKeyCount = 0
val keyCostStrings = buildList {
@@ -138,5 +139,5 @@ object CorpseTracker {
}
fun isEnabled() =
- config.enabled && IslandType.DWARVEN_MINES.isInIsland() && (!config.onlyInMineshaft || IslandType.MINESHAFT.isInIsland())
+ LorenzUtils.inSkyBlock && config.enabled && (IslandType.MINESHAFT.isInIsland() || (!config.onlyInMineshaft && MiningAPI.inGlacialTunnels()))
}