Support for LongTimeEvent spawns with random heading and set respawn time.

L2J_Mobius_01.0_Ertheia/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_02.5_Underground/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_03.0_Helios/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_04.0_GrandCrusade/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_05.0_Salvation/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_05.5_EtinasFate/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_06.0_Fafurion/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,6 +37,7 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
@@ -43,7 +45,9 @@ import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +86,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -240,7 +246,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -248,7 +255,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -373,9 +380,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,6 +37,7 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
@@ -43,7 +45,9 @@ import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +86,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -240,7 +246,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -248,7 +255,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -373,9 +380,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_10.2_MasterClass/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,6 +37,7 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
@@ -43,7 +45,9 @@ import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +86,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -240,7 +246,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -248,7 +255,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -373,9 +380,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_10.3_MasterClass/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,6 +37,7 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
@@ -43,7 +45,9 @@ import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +86,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -240,7 +246,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -248,7 +255,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -373,9 +380,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:integer" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -44,9 +44,11 @@ import org.l2jmobius.gameserver.data.sql.NpcTable;
 import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.spawn.Spawn;
 import org.l2jmobius.gameserver.script.DateRange;
 import org.l2jmobius.gameserver.util.Broadcast;
 
@@ -66,24 +68,26 @@ public class LongTimeEvent extends Quest
 	protected String _endMsg = "";
 	protected int _enterAnnounceId = -1;
 	
-	// NPCs to spawm and their spawn points
+	// NPCs to spawn and their spawn points
 	protected final List<NpcSpawn> _spawnList = new ArrayList<>();
 	
 	// Drop data for event
 	protected final List<EventDropHolder> _dropList = new ArrayList<>();
 	
-	// Items to destroy when event ends.
+	// Items to destroy when event ends
 	protected final List<Integer> _destroyItemsOnEnd = new ArrayList<>();
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final int respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, int spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -225,7 +229,8 @@ public class LongTimeEvent extends Quest
 									final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 									final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 									final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+									final int respawnTime = d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("respawnTime").getNodeValue()) : 0;
 									
 									if (NpcTable.getInstance().getTemplate(npcId) == null)
 									{
@@ -233,7 +238,7 @@ public class LongTimeEvent extends Quest
 										continue;
 									}
 									
-									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 								}
 								catch (NumberFormatException nfe)
 								{
@@ -321,9 +326,16 @@ public class LongTimeEvent extends Quest
 		
 		// Add spawns.
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd.intValue());
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd.intValue());
+			if (npcSpawn.respawnTime > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(npcSpawn.respawnTime / 1000);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - npcSpawn.respawnTime);
+			}
 		}
 		
 		// Event enter announcement.

L2J_Mobius_C6_Interlude/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:integer" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -44,9 +44,11 @@ import org.l2jmobius.gameserver.data.sql.NpcTable;
 import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.holders.EventDropHolder;
+import org.l2jmobius.gameserver.model.spawn.Spawn;
 import org.l2jmobius.gameserver.script.DateRange;
 import org.l2jmobius.gameserver.util.Broadcast;
 
@@ -66,24 +68,26 @@ public class LongTimeEvent extends Quest
 	protected String _endMsg = "";
 	protected int _enterAnnounceId = -1;
 	
-	// NPCs to spawm and their spawn points
+	// NPCs to spawn and their spawn points
 	protected final List<NpcSpawn> _spawnList = new ArrayList<>();
 	
 	// Drop data for event
 	protected final List<EventDropHolder> _dropList = new ArrayList<>();
 	
-	// Items to destroy when event ends.
+	// Items to destroy when event ends
 	protected final List<Integer> _destroyItemsOnEnd = new ArrayList<>();
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final int respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, int spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -225,7 +229,8 @@ public class LongTimeEvent extends Quest
 									final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 									final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 									final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+									final int respawnTime = d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("respawnTime").getNodeValue()) : 0;
 									
 									if (NpcTable.getInstance().getTemplate(npcId) == null)
 									{
@@ -233,7 +238,7 @@ public class LongTimeEvent extends Quest
 										continue;
 									}
 									
-									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 								}
 								catch (NumberFormatException nfe)
 								{
@@ -321,9 +326,16 @@ public class LongTimeEvent extends Quest
 		
 		// Add spawns.
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd.intValue());
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd.intValue());
+			if (npcSpawn.respawnTime > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(npcSpawn.respawnTime / 1000);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - npcSpawn.respawnTime);
+			}
 		}
 		
 		// Event enter announcement.

L2J_Mobius_CT_0_Interlude/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:integer" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -44,7 +44,9 @@ import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +84,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final int respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, int spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -230,7 +234,8 @@ public class LongTimeEvent extends Quest
 									final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 									final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 									final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+									final int respawnTime = d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("respawnTime").getNodeValue()) : 0;
 									
 									if (NpcData.getInstance().getTemplate(npcId) == null)
 									{
@@ -238,7 +243,7 @@ public class LongTimeEvent extends Quest
 										continue;
 									}
 									
-									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 								}
 								catch (NumberFormatException nfe)
 								{
@@ -353,9 +358,16 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			if (npcSpawn.respawnTime > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(npcSpawn.respawnTime);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - npcSpawn.respawnTime);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:integer" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -44,7 +44,9 @@ import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +84,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final int respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, int spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -230,7 +234,8 @@ public class LongTimeEvent extends Quest
 									final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 									final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 									final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+									final int respawnTime = d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("respawnTime").getNodeValue()) : 0;
 									
 									if (NpcData.getInstance().getTemplate(npcId) == null)
 									{
@@ -238,7 +243,7 @@ public class LongTimeEvent extends Quest
 										continue;
 									}
 									
-									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 								}
 								catch (NumberFormatException nfe)
 								{
@@ -353,9 +358,16 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			if (npcSpawn.respawnTime > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(npcSpawn.respawnTime);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - npcSpawn.respawnTime);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:integer" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -44,7 +44,9 @@ import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.EventDropManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +84,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final int respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, int spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -230,7 +234,8 @@ public class LongTimeEvent extends Quest
 									final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 									final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 									final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+									final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+									final int respawnTime = d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("respawnTime").getNodeValue()) : 0;
 									
 									if (NpcData.getInstance().getTemplate(npcId) == null)
 									{
@@ -238,7 +243,7 @@ public class LongTimeEvent extends Quest
 										continue;
 									}
 									
-									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 								}
 								catch (NumberFormatException nfe)
 								{
@@ -353,9 +358,16 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			if (npcSpawn.respawnTime > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(npcSpawn.respawnTime);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - npcSpawn.respawnTime);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_1.0/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Classic_Interlude/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,13 +37,16 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
 import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -81,13 +85,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -239,7 +245,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -247,7 +254,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -365,9 +372,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,6 +37,7 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
@@ -43,7 +45,9 @@ import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +86,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -240,7 +246,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -248,7 +255,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -373,9 +380,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,6 +37,7 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
@@ -43,7 +45,9 @@ import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +86,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -240,7 +246,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -248,7 +255,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -373,9 +380,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,6 +37,7 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
@@ -43,7 +45,9 @@ import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +86,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -240,7 +246,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -248,7 +255,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -373,9 +380,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);

L2J_Mobius_Essence_6.3_Crusader/dist/game/data/xsd/eventConfig.xsd

@@ -29,7 +29,8 @@
 									<xs:attribute name="x" type="xs:integer" use="required" />
 									<xs:attribute name="y" type="xs:integer" use="required" />
 									<xs:attribute name="z" type="xs:integer" use="required" />
-									<xs:attribute name="heading" type="xs:integer" use="required" />
+									<xs:attribute name="heading" type="xs:integer" use="optional" />
+									<xs:attribute name="respawnTime" type="xs:string" use="optional"/>
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java

@@ -21,6 +21,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -36,6 +37,7 @@ import org.w3c.dom.Node;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.IXmlReader;
+import org.l2jmobius.commons.util.TimeUtil;
 import org.l2jmobius.gameserver.data.ItemTable;
 import org.l2jmobius.gameserver.data.sql.AnnouncementsTable;
 import org.l2jmobius.gameserver.data.xml.NpcData;
@@ -43,7 +45,9 @@ import org.l2jmobius.gameserver.instancemanager.events.EventDropManager;
 import org.l2jmobius.gameserver.instancemanager.events.EventShrineManager;
 import org.l2jmobius.gameserver.instancemanager.events.ItemDeletionInfoManager;
 import org.l2jmobius.gameserver.model.Location;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.announce.EventAnnouncement;
 import org.l2jmobius.gameserver.model.events.Containers;
@@ -82,13 +86,15 @@ public class LongTimeEvent extends Quest
 	
 	protected class NpcSpawn
 	{
-		protected final Location loc;
 		protected final int npcId;
+		protected final Location loc;
+		protected final Duration respawnTime;
 		
-		protected NpcSpawn(int pNpcId, Location spawnLoc)
+		protected NpcSpawn(int spawnNpcId, Location spawnLoc, Duration spawnRespawnTime)
 		{
+			npcId = spawnNpcId;
 			loc = spawnLoc;
-			npcId = pNpcId;
+			respawnTime = spawnRespawnTime;
 		}
 	}
 	
@@ -240,7 +246,8 @@ public class LongTimeEvent extends Quest
 										final int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
 										final int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
 										final int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
-										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+										final int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : -1;
+										final Duration respawnTime = TimeUtil.parseDuration(d.getAttributes().getNamedItem("respawnTime").getNodeValue() != null ? d.getAttributes().getNamedItem("respawnTime").getNodeValue() : "0sec");
 										
 										if (NpcData.getInstance().getTemplate(npcId) == null)
 										{
@@ -248,7 +255,7 @@ public class LongTimeEvent extends Quest
 											continue;
 										}
 										
-										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+										_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading), respawnTime));
 									}
 									catch (NumberFormatException nfe)
 									{
@@ -373,9 +380,17 @@ public class LongTimeEvent extends Quest
 	private final Consumer<OnServerStart> _spawnNpcs = event ->
 	{
 		final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis();
-		for (NpcSpawn spawn : _spawnList)
+		for (NpcSpawn npcSpawn : _spawnList)
 		{
-			addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			final Npc npc = addSpawn(npcSpawn.npcId, npcSpawn.loc.getX(), npcSpawn.loc.getY(), npcSpawn.loc.getZ(), npcSpawn.loc.getHeading(), false, millisToEventEnd, false);
+			final int respawnDelay = (int) npcSpawn.respawnTime.toMillis();
+			if (respawnDelay > 0)
+			{
+				final Spawn spawn = npc.getSpawn();
+				spawn.setRespawnDelay(respawnDelay);
+				spawn.startRespawn();
+				ThreadPool.schedule(spawn::stopRespawn, millisToEventEnd - respawnDelay);
+			}
 		}
 		
 		Containers.Global().removeListenerIf(EventType.ON_SERVER_START, listener -> listener.getOwner() == this);