yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flip the check order to make more sense for useWith interactions

Browse Source
This commit is contained in:
ceikry
2021-08-25 21:56:54 -05:00
parent 88466e94d6
commit d0b532ef29
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/kotlin/rs09/game/interaction/InteractionListeners.kt
+3 -2
View File
@@ -7,6 +7,7 @@ import core.game.node.Node
import core.game.node.entity.Entity import core.game.node.entity.Entity
import core.game.node.entity.player.Player import core.game.node.entity.player.Player
import core.game.world.map.Location import core.game.world.map.Location
import rs09.game.system.SystemLogger
object InteractionListeners { object InteractionListeners {
private val listeners = HashMap<String,(Player, Node) -> Boolean>(1000) private val listeners = HashMap<String,(Player, Node) -> Boolean>(1000)
@@ -148,9 +149,9 @@ object InteractionListeners {
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) { val destOverride = if(flipped) {
getOverride(type, with.id, "use") ?: getOverride(type, with.id) ?: getOverride(type, "use") getOverride(type, used.id, "use") ?: getOverride(type, with.id) ?: getOverride(type, "use")
} else { } else {
getOverride(type, used.id, "use") ?: getOverride(type, used.id) ?: getOverride(type, "use") getOverride(type, with.id, "use") ?: getOverride(type, used.id) ?: getOverride(type, "use")
} }