Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Sharks can now be caught with barb-tail harpoon

Browse source 
Fixed incorrect animation when fishing with a barb-tail harpoon
This commit is contained in:
Savan ScapeOnine 2022-12-17 10:37:38 +00:00 • committed by Ryan
parent 760653067a
commit 89bcf30746
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Server/src/main/kotlin/rs09/game/node/entity/skill/gather/fishing/FishingPulse.kt
View file

@ -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
)