From c12cbc0f91829efc9b1b7710c9c2eaadf59b8b32 Mon Sep 17 00:00:00 2001 From: ceikry Date: Wed, 4 Aug 2021 22:55:57 -0500 Subject: [PATCH] Make penguin spying infallible --- .../rs09/game/node/entity/skill/farming/CropHarvester.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt index 15f7331e3..0589276c5 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt @@ -16,7 +16,7 @@ import org.rs09.consts.Items @Initializable class CropHarvester : OptionHandler() { - val nonLives = arrayOf(PatchType.HERB, PatchType.CACTUS, PatchType.BELLADONNA, PatchType.HOPS, PatchType.ALLOTMENT,PatchType.EVIL_TURNIP) + val livesBased = arrayOf(PatchType.HERB, PatchType.CACTUS, PatchType.BELLADONNA, PatchType.HOPS, PatchType.ALLOTMENT,PatchType.EVIL_TURNIP) val spadeAnim = Animation(830) @@ -69,13 +69,13 @@ class CropHarvester : OptionHandler() { delay = 2 player.inventory.add(Item(plantable.harvestItem,1)) player.skills.addExperience(Skills.FARMING,plantable.harvestXP) - if(patch.patch.type in nonLives){ - patch.harvestAmt-- - } else { + if(patch.patch.type in livesBased){ patch.rollLivesDecrement( ContentAPI.getDynLevel(player, Skills.FARMING), requiredItem == Items.MAGIC_SECATEURS_7409 ) + } else { + patch.harvestAmt-- } return patch.cropLives <= 0 || patch.harvestAmt <= 0 }