From 9f9f2e30fd3aad46c01a1ddc0c12b5b7803b0520 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sun, 14 Mar 2021 20:47:22 -0500 Subject: [PATCH] More bugfixes --- .../quest/members/asoulsbane/ASoulsBane.java | 6 +++++- .../quest/members/asoulsbane/ASoulsBanePlugin.java | 6 +++++- .../quest/members/merlinscrystal/MerlinCrystal.java | 1 + .../rs09/game/content/activity/mta/MTAListeners.kt | 13 +++++++++++++ .../members/asoulsbane/SoulsBaneLaunaDialogue.kt | 7 +++++-- 5 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 Server/src/main/kotlin/rs09/game/content/activity/mta/MTAListeners.kt diff --git a/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java index 4443bc4e3..0d729ec88 100644 --- a/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java +++ b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java @@ -1,3 +1,4 @@ +/* package core.game.content.quest.members.asoulsbane; import core.game.node.entity.player.Player; @@ -6,9 +7,11 @@ import core.plugin.Initializable; import rs09.game.content.quest.members.asoulsbane.SoulsBaneLaunaDialogue; import rs09.plugin.PluginManager; +*/ /** * Author: afaroutdude - */ + *//* + @Initializable public class ASoulsBane extends Quest { public static final String NAME = "A Soul's Bane"; @@ -99,3 +102,4 @@ public class ASoulsBane extends Quest { } } } +*/ diff --git a/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java index 72be970b3..51e230d6b 100644 --- a/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java @@ -1,3 +1,4 @@ +/* package core.game.content.quest.members.asoulsbane; import core.cache.def.impl.ObjectDefinition; @@ -19,9 +20,11 @@ import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import rs09.plugin.PluginManager; +*/ /** * Author: afaroutdude - */ + *//* + public class ASoulsBanePlugin extends OptionHandler { private static final int[] RIFT_IDS = {13967,13968,13969,13970,13971,13972,13973,13974,13975,13976,13977,13978,13979,13980,13981,13982,13983,13984,13985,13986,13987,13988,13989,13990,13991,13992,13993}; @@ -157,3 +160,4 @@ public class ASoulsBanePlugin extends OptionHandler { } } } +*/ diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java index bfe82454c..7150f515c 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java @@ -88,6 +88,7 @@ public final class MerlinCrystal extends Quest { new SirLucan(), new SirMordredNPC(), new SirPalomedes(), + new SirGawainDialogue(), new TheLadyOfTheLake(), new ThrantaxDialogue(), new RenegadeKnightDialogue()); diff --git a/Server/src/main/kotlin/rs09/game/content/activity/mta/MTAListeners.kt b/Server/src/main/kotlin/rs09/game/content/activity/mta/MTAListeners.kt new file mode 100644 index 000000000..78bba76db --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/content/activity/mta/MTAListeners.kt @@ -0,0 +1,13 @@ +package rs09.game.content.activity.mta + +import org.rs09.consts.NPCs +import rs09.game.interaction.InteractionListener + +class MTAListeners : InteractionListener() { + override fun defineListeners() { + on(NPCs.MAZE_GUARDIAN_3102,NPC,"talk-to"){player,node -> + player.dialogueInterpreter.open(node.id, node) + return@on true + } + } +} \ No newline at end of file diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt index 78e9f8808..d63935faa 100644 --- a/Server/src/main/kotlin/rs09/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt @@ -1,3 +1,4 @@ +/* package rs09.game.content.quest.members.asoulsbane import core.game.content.dialogue.DialoguePlugin @@ -6,10 +7,12 @@ import core.game.content.quest.members.asoulsbane.ASoulsBane import core.game.node.entity.player.Player import core.game.node.entity.player.link.quest.Quest +*/ /** * Launa * @author afaroutdude - */ + *//* + class SoulsBaneLaunaDialogue(player: Player? = null) : DialoguePlugin(player) { lateinit var quest: Quest @@ -79,4 +82,4 @@ class SoulsBaneLaunaDialogue(player: Player? = null) : DialoguePlugin(player) { override fun getIds(): IntArray { return intArrayOf(3638, 3639, 3640) } -} \ No newline at end of file +}*/