From a2eafa8bc03c9506c2f6db3c267d092bbe77a6a0 Mon Sep 17 00:00:00 2001
From: Player Name <esonketdc@mozmail.com>
Date: Thu, 14 Nov 2024 10:44:00 +0000
Subject: [PATCH] Fixed exception on server boot related to a duplicated
 attempt to register dialogue for Jarvald

---
 .../region/fremennik/rellekka/dialogue/JarvaldDialogue.kt      | 3 +--
 .../region/fremennik/rellekka/handlers/RellekkaZone.java       | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Server/src/main/content/region/fremennik/rellekka/dialogue/JarvaldDialogue.kt b/Server/src/main/content/region/fremennik/rellekka/dialogue/JarvaldDialogue.kt
index 7faafa16d..cdf685e13 100644
--- a/Server/src/main/content/region/fremennik/rellekka/dialogue/JarvaldDialogue.kt
+++ b/Server/src/main/content/region/fremennik/rellekka/dialogue/JarvaldDialogue.kt
@@ -200,7 +200,6 @@ class JarvaldDialogue(player: Player? = null) : DialoguePlugin(player) {
 	}
 
 	override fun getIds(): IntArray {
-		// 2435 is a wrapper for 2436
-		return intArrayOf(2435, NPCs.JARVALD_2436, NPCs.JARVALD_2437, NPCs.JARVALD_2438)
+		return intArrayOf(NPCs.JARVALD_2435, NPCs.JARVALD_2436, NPCs.JARVALD_2437, NPCs.JARVALD_2438)
 	}
 }
diff --git a/Server/src/main/content/region/fremennik/rellekka/handlers/RellekkaZone.java b/Server/src/main/content/region/fremennik/rellekka/handlers/RellekkaZone.java
index 75d7c1e34..4698885bb 100644
--- a/Server/src/main/content/region/fremennik/rellekka/handlers/RellekkaZone.java
+++ b/Server/src/main/content/region/fremennik/rellekka/handlers/RellekkaZone.java
@@ -1,6 +1,5 @@
 package content.region.fremennik.rellekka.handlers;
 
-import content.region.fremennik.rellekka.dialogue.JarvaldDialogue;
 import content.region.fremennik.rellekka.dialogue.MariaGunnarsDialogue;
 import core.cache.def.impl.SceneryDefinition;
 import core.game.system.task.Pulse;
@@ -41,7 +40,6 @@ public final class RellekkaZone extends MapZone implements Plugin<Object> {
 	@Override
 	public Plugin<Object> newInstance(Object arg) throws Throwable {
 		ZoneBuilder.configure(this);
-		ClassScanner.definePlugin(new JarvaldDialogue());
 		ClassScanner.definePlugins(new RellekaOptionHandler(), new MariaGunnarsDialogue());
 		ClassScanner.definePlugin(new OptionHandler() {