Merge branch 'i-am-cringe/2009scape-master'

# Conflicts:
#	Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.kt
This commit is contained in:
ceikry
2021-07-19 12:12:07 -05:00
@@ -26,8 +26,9 @@ import rs09.game.world.GameWorld
*/
class AbyssPlugin : InteractionListener() {
val OBSTACLE = AbbysalObstacle.values().filter { it != AbbysalObstacle.MINE }.map { it.option }.toTypedArray()
val OBSTACLE = AbbysalObstacle.values().filter { it != AbbysalObstacle.MINE && it != AbbysalObstacle.SQUEEZE }.map { it.option }.toTypedArray()
val miningObstacle = 7158
val agilityObstacle = 7164
override fun defineListeners() {
definePlugin(AbyssalNPC())
@@ -56,6 +57,11 @@ class AbyssPlugin : InteractionListener() {
obstacle!!.handle(player, node as Scenery)
return@on true
}
on(agilityObstacle, SCENERY, "squeeze-through"){ player, node ->
val obstacle = AbbysalObstacle.forObject(node as Scenery)
obstacle!!.handle(player, node as Scenery)
return@on true
}
}