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

Fixed an exploit related to farming

Browse source
This commit is contained in:
ceikry 2021-08-04 17:40:58 -05:00
parent f48e853b15
commit 1347c70a71
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt
View file

@ -16,6 +16,8 @@ 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 spadeAnim = Animation(830)
override fun newInstance(arg: Any?): Plugin<Any> {
@ -67,8 +69,15 @@ class CropHarvester : OptionHandler() {
delay = 2
player.inventory.add(Item(plantable.harvestItem,1))
player.skills.addExperience(Skills.FARMING,plantable.harvestXP)
patch.rollLivesDecrement(ContentAPI.getDynLevel(player, Skills.FARMING), requiredItem == Items.MAGIC_SECATEURS_7409)
return patch.cropLives <= 0
if(patch.patch.type in nonLives){
patch.harvestAmt--
} else {
patch.rollLivesDecrement(
ContentAPI.getDynLevel(player, Skills.FARMING),
requiredItem == Items.MAGIC_SECATEURS_7409
)
}
return patch.cropLives <= 0 || patch.harvestAmt <= 0
}
})

4
Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Patch.kt
View file

@ -16,6 +16,10 @@ class Patch(val player: Player, val patch: FarmingPatch, var plantable: Plantabl
var cropLives = 3
fun setNewHarvestAmount() {
harvestAmt = when (plantable) {
Plantable.LIMPWURT_SEED, Plantable.WOAD_SEED -> 3
else -> 1
}
cropLives = 3
}