From c93caa31749cf371fa6d723f64ad369efb699dda Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 2 May 2015 17:15:10 +0000
Subject: [PATCH] [Classic] Do not announce Olympiad.

---
 trunk/java/com/l2jserver/gameserver/GameServer.java             | 2 +-
 .../java/com/l2jserver/gameserver/model/olympiad/Olympiad.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/trunk/java/com/l2jserver/gameserver/GameServer.java b/trunk/java/com/l2jserver/gameserver/GameServer.java
index 03517abf93..ed35a34e2e 100644
--- a/trunk/java/com/l2jserver/gameserver/GameServer.java
+++ b/trunk/java/com/l2jserver/gameserver/GameServer.java
@@ -313,9 +313,9 @@ public final class GameServer
 		GrandBossManager.getInstance().initZones();
 		EventDroplist.getInstance();
 		
+		printSection("Olympiad");
 		if (!Config.SERVER_CLASSIC_SUPPORT)
 		{
-			printSection("Olympiad");
 			Olympiad.getInstance();
 		}
 		Hero.getInstance();
diff --git a/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java b/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java
index 361792520a..0cd4ce8372 100644
--- a/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java
+++ b/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java
@@ -491,7 +491,7 @@ public class Olympiad extends ListenersContainer
 			_logResults.info("Result,Player1,Player2,Player1 HP,Player2 HP,Player1 Damage,Player2 Damage,Points,Classed");
 			
 			_gameManager = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(OlympiadGameManager.getInstance(), 30000, 30000);
-			if (Config.ALT_OLY_ANNOUNCE_GAMES)
+			if (Config.ALT_OLY_ANNOUNCE_GAMES && !Config.SERVER_CLASSIC_SUPPORT)
 			{
 				_gameAnnouncer = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new OlympiadAnnouncer(), 30000, 500);
 			}