From 89bcf3074681ccfbfe84b76f9adb9e44fbbf25de Mon Sep 17 00:00:00 2001 From: Savan ScapeOnine Date: Sat, 17 Dec 2022 10:37:38 +0000 Subject: [PATCH] Sharks can now be caught with barb-tail harpoon Fixed incorrect animation when fishing with a barb-tail harpoon --- .../game/node/entity/skill/gather/fishing/FishingPulse.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/fishing/FishingPulse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/fishing/FishingPulse.kt index 961a1d27f..871f32b8f 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/fishing/FishingPulse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/fishing/FishingPulse.kt @@ -173,16 +173,16 @@ class FishingPulse(player: Player?, npc: NPC, private val option: FishingOption? } private fun isBareHanded(p: Player): Boolean { - if (option == FishingOption.HARPOON) { + if (option == FishingOption.HARPOON || option == FishingOption.N_HARPOON) { if (checkFish(p) > 0 && !(player.inventory.containsItem( option.tool - ) || player.equipment.containsItem(option.tool)) + ) || player.equipment.containsItem(option.tool) || hasBarbTail()) ) { return true } if (checkFish(p) > 2 && !(player.inventory.containsItem( option.tool - ) || player.equipment.containsItem(option.tool)) + ) || player.equipment.containsItem(option.tool) || hasBarbTail()) ) { return true } @@ -228,7 +228,7 @@ class FishingPulse(player: Player?, npc: NPC, private val option: FishingOption? * @return `True` if so. */ private fun hasBarbTail(): Boolean { - if (option == FishingOption.HARPOON) { + if (option == FishingOption.HARPOON || option == FishingOption.N_HARPOON) { if (player.inventory.containsItem(FishingOption.BARB_HARPOON.tool) || player.equipment.containsItem( FishingOption.BARB_HARPOON.tool )