diff --git a/Server/src/main/content/region/misthalin/lumbridge/quest/therestlessghost/RestlessGhostSkull.java b/Server/src/main/content/region/misthalin/lumbridge/quest/therestlessghost/RestlessGhostSkull.java index 0ddb1a9fc..58bb7d0b1 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/quest/therestlessghost/RestlessGhostSkull.java +++ b/Server/src/main/content/region/misthalin/lumbridge/quest/therestlessghost/RestlessGhostSkull.java @@ -1,11 +1,14 @@ package content.region.misthalin.lumbridge.quest.therestlessghost; +import core.api.Container; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; -import core.game.node.item.Item; import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; +import org.rs09.consts.Items; + +import static core.api.ContentAPIKt.removeItem; /** * Represents the plugin used to add the skull to the cofin. @@ -37,7 +40,7 @@ public final class RestlessGhostSkull extends UseWithHandler { event.getPlayer().getDialogueInterpreter().sendDialogue("Maybe I should open it first."); return true; } - if (event.getPlayer().getInventory().remove(new Item(964, 24))) { + if (removeItem(event.getPlayer(), Items.SKULL_964, Container.INVENTORY)) { event.getPlayer().getPacketDispatch().sendMessage("You put the skull in the coffin."); event.getPlayer().getQuestRepository().getQuest(RestlessGhost.NAME).finish(event.getPlayer()); } diff --git a/Server/src/main/content/region/wilderness/handlers/WildernessGateHandler.kt b/Server/src/main/content/region/wilderness/handlers/WildernessGateHandler.kt index d8f8b099a..d65982858 100644 --- a/Server/src/main/content/region/wilderness/handlers/WildernessGateHandler.kt +++ b/Server/src/main/content/region/wilderness/handlers/WildernessGateHandler.kt @@ -17,18 +17,20 @@ class WildernessGateHandler : InteractionListener { } private fun handleGate (player: Player, node: Node) : Boolean { - val isEntering = !player.skullManager.isDeepWilderness() - - if (isEntering) - openDialogue (player, GateDialogue(node.asScenery())) - else { - if (player.properties.combatPulse.isInCombat) - sendMessage (player, "You cannot leave while you are under attack.") + if (player.location.y > 3890) { + val isEntering = !player.skullManager.isDeepWilderness() + + if (isEntering) + openDialogue(player, GateDialogue(node.asScenery())) else { - DoorActionHandler.handleAutowalkDoor (player, node.asScenery()) - player.skullManager.isDeepWilderness = false + if (player.properties.combatPulse.isInCombat) + sendMessage(player, "You cannot leave while you are under attack.") + else { + DoorActionHandler.handleAutowalkDoor(player, node.asScenery()) + player.skullManager.isDeepWilderness = false + } } - } + } else DoorActionHandler.handleAutowalkDoor (player, node.asScenery()) return true } diff --git a/Server/src/main/core/game/node/entity/lock/ActionLocks.java b/Server/src/main/core/game/node/entity/lock/ActionLocks.java index af76575a1..e8a816a88 100644 --- a/Server/src/main/core/game/node/entity/lock/ActionLocks.java +++ b/Server/src/main/core/game/node/entity/lock/ActionLocks.java @@ -64,7 +64,6 @@ public final class ActionLocks { */ public void lock(int ticks) { lockMovement(ticks); - lockTeleport(ticks); lockInteractions(ticks); } @@ -73,7 +72,6 @@ public final class ActionLocks { */ public void unlock() { unlockMovement(); - unlockTeleport(); unlockInteraction(); }