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

Fixed issue causing canoe stations to permanently lock players when interrupted

Browse source
This commit is contained in:
ceikry 2023-06-08 19:52:26 -05:00 • committed by Ryan
parent f26a4660ea
commit 3d8857e01c
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Server/src/main/content/global/travel/canoe/CanoeInterfaceListeners.kt
View file

@ -44,7 +44,7 @@ class CanoeInterfaceListeners : InterfaceListener {
return@on true return@on true
} }
player.lock() lock(player, 4)
animate(player, CanoeUtils.getShapeAnimation(axe)) animate(player, CanoeUtils.getShapeAnimation(axe))
player.pulseManager.run(object : Pulse(3) { player.pulseManager.run(object : Pulse(3) {
override fun pulse(): Boolean { override fun pulse(): Boolean {
@ -98,7 +98,7 @@ class CanoeInterfaceListeners : InterfaceListener {
travelAnimDur = Animation(interfaceAnimationId).duration travelAnimDur = Animation(interfaceAnimationId).duration
} }
player.lock() lock(player, travelAnimDur + 4)
player.interfaceManager.close() player.interfaceManager.close()
player.pulseManager.run(object : Pulse(){ player.pulseManager.run(object : Pulse(){
var counter = 0 var counter = 0

4
Server/src/main/content/global/travel/canoe/CanoeStationListener.kt
View file

@ -46,7 +46,7 @@ class CanoeStationListener : InteractionListener {
player.packetDispatch.sendMessage("You need a woodcutting level of at least 12 to chop down this tree.") player.packetDispatch.sendMessage("You need a woodcutting level of at least 12 to chop down this tree.")
return@on true return@on true
} }
player.lock() lock(player, 5)
setVarp(player, varbit.varpId, 0) setVarp(player, varbit.varpId, 0)
player.faceLocation(CanoeUtils.getFaceLocation(player.location)) player.faceLocation(CanoeUtils.getFaceLocation(player.location))
player.animate(axe.animation) player.animate(axe.animation)
@ -79,7 +79,7 @@ class CanoeStationListener : InteractionListener {
val varbit = node.asScenery().definition.configFile val varbit = node.asScenery().definition.configFile
val canoe = CanoeUtils.getCanoeFromVarbit(player, varbit) val canoe = CanoeUtils.getCanoeFromVarbit(player, varbit)
player.animator.animate(PUSH) player.animator.animate(PUSH)
player.lock() lock(player, 2)
player.faceLocation(CanoeUtils.getFaceLocation(player.location)) player.faceLocation(CanoeUtils.getFaceLocation(player.location))
player.pulseManager.run(object : Pulse(){ player.pulseManager.run(object : Pulse(){
override fun pulse(): Boolean { override fun pulse(): Boolean {