2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-12 17:40:17 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug where the player could get locked planting while farming

Browse source
This commit is contained in:
Player Name 2025-01-20 12:46:57 +00:00 • committed by Ryan
parent d08656021c
commit d5c7d74767
1 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

80
Server/src/main/content/global/skill/farming/UseWithPatchHandler.kt
View file

@ -263,51 +263,53 @@ class UseWithPatchHandler : InteractionListener {
sendMessage(player, "You need ${prependArticle(requiredItem.asItem().name.lowercase())} to plant that.") sendMessage(player, "You need ${prependArticle(requiredItem.asItem().name.lowercase())} to plant that.")
return@onUseWith true return@onUseWith true
} }
player.lock()
if (removeItem(player, plantItem)) { queueScript(player, 0, QueueStrength.WEAK) { stage: Int ->
when (requiredItem) { when (stage) {
Items.SPADE_952 -> { 0 -> {
animate(player, spadeDigAnim) val (anim, sound) = when (requiredItem) {
playAudio(player, Sounds.DIGSPADE_1470) Items.SPADE_952 -> Pair(spadeDigAnim, Sounds.DIGSPADE_1470)
else -> Pair(seedDibberAnim,Sounds.FARMING_DIBBING_2432)
}
animate(player, anim)
playAudio(player, sound)
val delay = if (patch.type == PatchType.TREE_PATCH || patch.type == PatchType.FRUIT_TREE_PATCH || plantable == Plantable.SCARECROW) 3 else 0
return@queueScript delayScript(player,anim.duration + delay)
} }
Items.SEED_DIBBER_5343 -> { 1 -> {
animate(player, seedDibberAnim) if (removeItem(player, plantItem)) {
playAudio(player, Sounds.FARMING_DIBBING_2432) if (plantable == Plantable.JUTE_SEED && patch == FarmingPatch.MCGRUBOR_HOPS && !player.achievementDiaryManager.hasCompletedTask(DiaryType.SEERS_VILLAGE, 0, 7)) {
player.achievementDiaryManager.finishTask(player, DiaryType.SEERS_VILLAGE, 0, 7)
}
p.plant(plantable)
rewardXP(player, Skills.FARMING, plantable.plantingXP)
p.setNewHarvestAmount()
if (p.patch.type == PatchType.TREE_PATCH || p.patch.type == PatchType.FRUIT_TREE_PATCH) {
addItem(player, Items.PLANT_POT_5350)
}
val itemAmount =
if (p.patch.type == PatchType.TREE_PATCH || p.patch.type == PatchType.FRUIT_TREE_PATCH) "the"
else if (plantItem.amount == 1) "a"
else plantItem.amount
val itemName =
if (plantItem.amount == 1) plantable.displayName else StringUtils.plusS(
plantable.displayName
)
val patchName = p.patch.type.displayName()
if (plantable == Plantable.SCARECROW) {
sendMessage(player, "You place the scarecrow in the $patchName.")
} else {
sendMessage(player, "You plant $itemAmount $itemName in the $patchName.")
}
}
return@queueScript stopExecuting(player)
} }
else -> return@queueScript stopExecuting(player)
} }
val delay = if (patch.type == PatchType.TREE_PATCH || patch.type == PatchType.FRUIT_TREE_PATCH || plantable == Plantable.SCARECROW) 0 else 3
submitIndividualPulse(player, object : Pulse(delay) {
override fun pulse(): Boolean {
if (plantable == Plantable.JUTE_SEED && patch == FarmingPatch.MCGRUBOR_HOPS && !player.achievementDiaryManager.hasCompletedTask(DiaryType.SEERS_VILLAGE, 0, 7)) {
player.achievementDiaryManager.finishTask(player, DiaryType.SEERS_VILLAGE, 0, 7)
}
p.plant(plantable)
rewardXP(player, Skills.FARMING, plantable.plantingXP)
p.setNewHarvestAmount()
if (p.patch.type == PatchType.TREE_PATCH || p.patch.type == PatchType.FRUIT_TREE_PATCH) {
addItem(player, Items.PLANT_POT_5350)
}
val itemAmount =
if (p.patch.type == PatchType.TREE_PATCH || p.patch.type == PatchType.FRUIT_TREE_PATCH) "the"
else if (plantItem.amount == 1) "a"
else plantItem.amount
val itemName = if (plantItem.amount == 1) plantable.displayName else StringUtils.plusS(plantable.displayName)
val patchName = p.patch.type.displayName()
if (plantable == Plantable.SCARECROW) {
sendMessage(player, "You place the scarecrow in the $patchName.")
} else {
sendMessage(player, "You plant $itemAmount $itemName in the $patchName.")
}
player.unlock()
return true
}
})
} }
} }
} }
return@onUseWith true return@onUseWith true
} }
} }