From de9e37ffaba02cf3e61d569b7867e14e79d5851a Mon Sep 17 00:00:00 2001 From: ceikry Date: Wed, 25 Aug 2021 20:17:38 -0500 Subject: [PATCH] Add dest override support to use with listeners --- .../kotlin/rs09/game/interaction/InteractionListeners.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Server/src/main/kotlin/rs09/game/interaction/InteractionListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/InteractionListeners.kt index cf71dc195..d7bf001c6 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/InteractionListeners.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/InteractionListeners.kt @@ -147,10 +147,16 @@ object InteractionListeners { var flipped = 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(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 { if (player.zoneMonitor.useWith(used.asItem(), with)) { return true