diff --git a/Server/src/main/content/global/ame/KidnapHelper.kt b/Server/src/main/content/global/ame/KidnapHelper.kt index 5cef011ba..6fa40c6d1 100644 --- a/Server/src/main/content/global/ame/KidnapHelper.kt +++ b/Server/src/main/content/global/ame/KidnapHelper.kt @@ -7,7 +7,7 @@ import core.game.node.entity.player.link.TeleportManager.TeleportType import core.game.world.map.Location fun kidnapPlayer(player: Player, loc: Location, type: TeleportType) { - setAttribute(player, "kidnapped-by-random", true) + setAttribute(player, "kidnapped-by-random", true) //only used in POH code when you leave the hut, so does not need /save. Do not rely on this outside of its intended POH use case. if (getAttribute(player, "/save:original-loc", null) == null) { setAttribute(player, "/save:original-loc", player.location) } @@ -15,14 +15,9 @@ fun kidnapPlayer(player: Player, loc: Location, type: TeleportType) { } fun returnPlayer(player: Player) { - // Prevent returning more than once and sending the player back to HOME_LOCATION - if (getAttribute(player, "kidnapped-by-random", null) == null) { - return - } - player.locks.unlockTeleport() val destination = getAttribute(player, "/save:original-loc", ServerConstants.HOME_LOCATION ?: Location.create(3222, 3218, 0)) teleport(player, destination) unlock(player) removeAttributes(player, "/save:original-loc", "kidnapped-by-random") -} \ No newline at end of file +} diff --git a/Server/src/main/content/global/ame/events/maze/MazeInterface.kt b/Server/src/main/content/global/ame/events/maze/MazeInterface.kt index 108d456ca..f408b1507 100644 --- a/Server/src/main/content/global/ame/events/maze/MazeInterface.kt +++ b/Server/src/main/content/global/ame/events/maze/MazeInterface.kt @@ -199,17 +199,16 @@ class MazeInterface : InteractionListener, EventHook, MapArea { on(Scenery.STRANGE_SHRINE_3634, IntType.SCENERY, "touch") { player, node -> player.unhook(this) + lock(player, 12) closeOverlay(player) queueScript(player, 0, QueueStrength.SOFT) { stage: Int -> when (stage) { 0 -> { - lock(player, 6) sendGraphics(Graphics(86, 0, 3), player.location) animate(player,862) return@queueScript delayScript(player, 6) } 1 -> { - lock(player, 6) sendGraphics(Graphics(1576, 0, 0), player.location) animate(player,8939) playAudio(player, Sounds.TELEPORT_ALL_200) @@ -274,4 +273,4 @@ class MazeInterface : InteractionListener, EventHook, MapArea { } } -} \ No newline at end of file +}