diff --git a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Cutscene.kt b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Cutscene.kt index fd2b5d917..683dc8b6d 100644 --- a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Cutscene.kt +++ b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Cutscene.kt @@ -6,7 +6,6 @@ import content.region.kandarin.seers.quest.elementalworkshop2.EW2Listeners.Compa import content.region.kandarin.seers.quest.elementalworkshop2.EW2Listeners.Companion.EXTRACTOR_GOOD import content.region.kandarin.seers.quest.elementalworkshop2.EW2Listeners.Companion.EXTRACTOR_GOOD_GFX import content.region.kandarin.seers.quest.elementalworkshop2.EW2Listeners.Companion.EXTR_GUN -import content.region.kandarin.seers.quest.elementalworkshop2.EW2Listeners.Companion.toInstance import content.region.kandarin.seers.quest.elementalworkshop2.EW2Session.Companion.EW2_REGION import content.region.kandarin.seers.quest.elementalworkshop2.ElementalWorkshop2.Companion.EW2ExtractorGun import content.region.kandarin.seers.quest.elementalworkshop2.ElementalWorkshop2.Companion.EW2StageVarbit @@ -24,7 +23,8 @@ import org.rs09.consts.Sounds class EW2Cutscene(player: Player, good: Boolean) : Cutscene(player) { override fun setup() { - setExit(toInstance(player, Location.create(1961, 5150, 0))) + // returns to the non-instanced region, since lower portion of the workshop isn't instanced + setExit(Location.create(1961, 5150, 0)) loadRegion(EW2_REGION) } diff --git a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Listeners.kt b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Listeners.kt index 6957766dd..8f64df01f 100644 --- a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Listeners.kt +++ b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Listeners.kt @@ -35,12 +35,8 @@ import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.skill.Skills import core.game.node.item.Item -import core.game.world.map.Direction import core.game.world.map.Location import core.game.world.update.flag.context.Animation -import core.net.packet.PacketRepository -import core.net.packet.context.CameraContext -import core.net.packet.out.CameraViewPacket import org.rs09.consts.* class EW2Listeners : InteractionListener { diff --git a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/JigCartNPC.kt b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/JigCartNPC.kt index 22c3bd1cc..6d6c45c0d 100644 --- a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/JigCartNPC.kt +++ b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/JigCartNPC.kt @@ -4,7 +4,6 @@ import content.region.kandarin.seers.quest.elementalworkshop2.EW2Listeners.Compa import core.game.node.entity.npc.NPC import core.game.node.entity.npc.NPCBehavior import core.game.world.map.path.ClipMaskSupplier -import org.rs09.consts.NPCs /** * Jig cart in Elemental Workshop II