From 4d08c902debc2ed9296c32c968f38e668c0584d9 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 3 Jul 2020 22:22:59 +0000
Subject: [PATCH] Fixed olympiad buffers respawning occasionally. Contributed
 by Sahar.

---
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 .../gameserver/model/olympiad/OlympiadStadium.java          | 6 ++----
 15 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
index 5790000b4a..add4d7bb59 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadStadium.java
@@ -53,7 +53,7 @@ public class OlympiadStadium
 		_zone = olyzone;
 		_instance = InstanceManager.getInstance().createInstance(olyzone.getInstanceTemplateId(), null);
 		_buffers = _instance.getNpcs().stream().map(Npc::getSpawn).collect(Collectors.toList());
-		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::decayMe);
+		_buffers.stream().map(Spawn::getLastSpawn).forEach(Npc::deleteMe);
 	}
 	
 	public OlympiadStadiumZone getZone()
@@ -88,13 +88,11 @@ public class OlympiadStadium
 	
 	public void spawnBuffers()
 	{
-		_buffers.forEach(Spawn::startRespawn);
-		_buffers.forEach(Spawn::doSpawn);
+		_buffers.forEach(spawn -> spawn.doSpawn(false));
 	}
 	
 	public void deleteBuffers()
 	{
-		_buffers.forEach(Spawn::stopRespawn);
 		_buffers.stream().map(Spawn::getLastSpawn).filter(Objects::nonNull).forEach(Npc::deleteMe);
 	}