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

Add dest override support to use with listeners

Browse source
This commit is contained in:
ceikry 2021-08-25 20:17:38 -05:00
parent 0cb1e53f67
commit de9e37ffab
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Server/src/main/kotlin/rs09/game/interaction/InteractionListeners.kt
View file

@ -147,10 +147,16 @@ object InteractionListeners {
var flipped = false var flipped = false
val method = get(used.id,with.id,type) ?: get(with.id,used.id,type).also { flipped = true } ?: return false val method = get(used.id,with.id,type) ?: get(with.id,used.id,type).also { flipped = true } ?: return false
val destOverride = if(flipped) {
getOverride(type, with.id, "use") ?: getOverride(type, with.id) ?: getOverride(type, "use")
} else {
getOverride(type, used.id, "use") ?: getOverride(type, used.id) ?: getOverride(type, "use")
}
if(type != 0) { if(type != 0) {
if(player.locks.isMovementLocked) return false if(player.locks.isMovementLocked) return false
player.pulseManager.run(object : MovementPulse(player, with, flag) { player.pulseManager.run(object : MovementPulse(player, with, flag, destOverride) {
override fun pulse(): Boolean { override fun pulse(): Boolean {
if (player.zoneMonitor.useWith(used.asItem(), with)) { if (player.zoneMonitor.useWith(used.asItem(), with)) {
return true return true