diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt index f5f87ee2c..fce359672 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt @@ -65,17 +65,22 @@ class FishingTimer { private fun countMobs() = EntityUtils.getEntities<EntityArmorStand>() .map { entity -> val name = entity.name - if (SeaCreatureManager.allFishingMobNames.any { name.contains(it) }) { + val isSummonedSoul = name.contains("'") + val hasFishingMobName = SeaCreatureManager.allFishingMobNames.any { name.contains(it) } + if (hasFishingMobName && !isSummonedSoul) { if (name == "Sea Emperor" || name == "Rider of the Deep") 2 else 1 } else 0 }.sum() private fun isRightLocation(): Boolean { + inHollows = false + + if (config.barnTimerForStranded && LorenzUtils.isStrandedProfile) return true + if (config.barnTimerCrystalHollows && IslandType.CRYSTAL_HOLLOWS.isInIsland()) { inHollows = true return true } - inHollows = false if (!IslandType.THE_FARMING_ISLANDS.isInIsland()) { return LocationUtils.playerLocation().distance(barnLocation) < 50 |
