From c6b21069250853a87f625e4a3f0711e3fb5d1ae6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 17 Sep 2022 21:37:00 +0000
Subject: [PATCH] Moved Jayce spawn to event config.

---
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 .../events/EveTheFortuneTeller/EveTheFortuneTeller.java     | 6 ------
 .../game/data/scripts/events/EveTheFortuneTeller/config.xml | 2 ++
 22 files changed, 22 insertions(+), 66 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index b42764ef46..3fc3f08a0c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2015" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index b42764ef46..3fc3f08a0c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2015" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index b42764ef46..3fc3f08a0c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2015" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index b42764ef46..3fc3f08a0c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2015" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index b42764ef46..3fc3f08a0c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2015" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index b42764ef46..3fc3f08a0c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2015" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index b42764ef46..3fc3f08a0c 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2015" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index b42764ef46..3fc3f08a0c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2015" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index 4ee6a3fe56..cd123c22e1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2029" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index 4ee6a3fe56..cd123c22e1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2029" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
index c5b681f7ba..a966bdff3e 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java
@@ -18,7 +18,6 @@ package events.EveTheFortuneTeller;
 
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.enums.LuckyGameType;
-import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
@@ -41,7 +40,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 	private static final int FORTUNE_READING_TICKET = 23767;
 	private static final int LUXURY_FORTUNE_READING_TICKET = 23768;
 	// Misc
-	private static final Location JAYCE_SPAWN = new Location(148090, 26644, -2209, 16383);
 	private static final NpcStringId[] JAYCE_TEXT =
 	{
 		NpcStringId.I_LOOK_WEST,
@@ -55,10 +53,6 @@ public class EveTheFortuneTeller extends LongTimeEvent
 		addFirstTalkId(EVE);
 		addTalkId(EVE);
 		addSpawnId(JAYCE);
-		if (isEventPeriod())
-		{
-			addSpawn(JAYCE, JAYCE_SPAWN, false, 0);
-		}
 	}
 	
 	@Override
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
index 4ee6a3fe56..cd123c22e1 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/EveTheFortuneTeller/config.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event name="Eve the Fortune Teller" active="11 11 1015-18 12 2029" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/eventConfig.xsd">
 	<spawnlist>
+		<!-- Jayce -->
+		<add npc="8540" x="148090" y="26644" z="-2209" heading="16383" /> <!-- Aden -->
 		<!-- Eve -->
 		<add npc="8542" x="-114178" y="255031" z="-1538" heading="16383" /> <!-- Talking Island -->
 		<add npc="8542" x="-82484" y="153527" z="-3168" heading="32767" /> <!-- Gludin -->