diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-09-10 09:16:53 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-09-10 09:16:53 +0200 |
| commit | 124c60665aea4dd6efac732b885af26ce221f046 (patch) | |
| tree | 14236b9e58fe9e230017ebbc2866f9fe956fff26 /src/main/java | |
| parent | b595c4a766455b5b3ee1fdbfa1c11c7762929efb (diff) | |
| download | skyhanni-124c60665aea4dd6efac732b885af26ce221f046.tar.gz skyhanni-124c60665aea4dd6efac732b885af26ce221f046.tar.bz2 skyhanni-124c60665aea4dd6efac732b885af26ce221f046.zip | |
Summoning souls should no longer be counted as sea creatures for the fishing timer.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreature.kt | 2 |
2 files changed, 4 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 83abe9f7e..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,7 +65,9 @@ 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() diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreature.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreature.kt index c2b452cbe..987a57d00 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreature.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreature.kt @@ -8,7 +8,7 @@ data class SeaCreature( ) { override fun toString(): String { - return chatColor + rare() + displayName + return chatColor + rare() + displayName } private fun rare(): String { |