diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index b757aaf5d0..6cc3d2f3e2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -77,7 +70,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
index f38aa7cc46..33f7642782 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -16,8 +16,6 @@
  */
 package org.l2jmobius.gameserver.model.olympiad;
 
-import java.util.Set;
-
 import org.l2jmobius.gameserver.datatables.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.Spawn;
@@ -30,13 +28,8 @@ import org.l2jmobius.gameserver.network.NpcStringId;
 public class OlympiadAnnouncer implements Runnable
 {
 	private static final int OLY_MANAGER = 31688;
-	private final Set<Spawn> _managers;
-	private int _currentStadium = 0;
 	
-	public OlympiadAnnouncer()
-	{
-		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
-	}
+	private int _currentStadium = 0;
 	
 	@Override
 	public void run()
@@ -72,7 +65,7 @@ public class OlympiadAnnouncer implements Runnable
 					}
 				}
 				
-				for (Spawn spawn : _managers)
+				for (Spawn spawn : SpawnTable.getInstance().getSpawns(OLY_MANAGER))
 				{
 					final Npc manager = spawn.getLastSpawn();
 					if (manager != null)