aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-10-09 00:11:32 +0200
committerGitHub <noreply@github.com>2024-10-09 09:11:32 +1100
commit86dd8b421b3a530f8ff5ef1197ce5aed3e5cc01e (patch)
tree009d7e22a96a1fcda20c48c3761b97c059ff9c92 /src/main/java/at/hannibal2
parent94851695702912ac12f37e1e7f89dac7cf1805fa (diff)
downloadskyhanni-86dd8b421b3a530f8ff5ef1197ce5aed3e5cc01e.tar.gz
skyhanni-86dd8b421b3a530f8ff5ef1197ce5aed3e5cc01e.tar.bz2
skyhanni-86dd8b421b3a530f8ff5ef1197ce5aed3e5cc01e.zip
Fix: Dungeon Fishing (#2697)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
index 596d6f49c..89ae7dc18 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingAPI.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
import at.hannibal2.skyhanni.events.RepositoryReloadEvent
import at.hannibal2.skyhanni.events.entity.EntityEnterWorldEvent
+import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager
import at.hannibal2.skyhanni.features.fishing.trophy.TrophyFishManager.getFilletValue
import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity
@@ -137,7 +138,8 @@ object FishingAPI {
return info?.getFilletValue(rarity) ?: 0
}
- fun isFishing(checkRodInHand: Boolean = true) = IsFishingDetection.isFishing || (checkRodInHand && holdingRod)
+ fun isFishing(checkRodInHand: Boolean = true) =
+ (IsFishingDetection.isFishing || (checkRodInHand && holdingRod)) && !DungeonAPI.inDungeon()
fun seaCreatureCount(entity: EntityArmorStand): Int {
val name = entity.name