Addition of OlympiadEnabled configuration.

L2J_Mobius_01.0_Ertheia/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 6pm (18) 
 # Default: 18
 AltOlyStartTime = 18

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -68,11 +69,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -47,11 +48,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java

@@ -530,6 +530,7 @@ public class Config
 	public static int WORLD_CHAT_MIN_LEVEL;
 	public static int WORLD_CHAT_POINTS_PER_DAY;
 	public static Duration WORLD_CHAT_INTERVAL;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static long ALT_OLY_CPERIOD;
@@ -2369,6 +2370,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 20);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 14400000);

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -94,9 +94,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -132,6 +132,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _gameAnnouncer = null;
 	
 	protected Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -141,6 +143,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	private void load()
 	{

L2J_Mobius_02.5_Underground/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 6pm (18) 
 # Default: 18
 AltOlyStartTime = 18

L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -68,11 +69,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -47,11 +48,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java

@@ -540,6 +540,7 @@ public class Config
 	public static int WORLD_CHAT_MIN_LEVEL;
 	public static int WORLD_CHAT_POINTS_PER_DAY;
 	public static Duration WORLD_CHAT_INTERVAL;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static long ALT_OLY_CPERIOD;
@@ -2394,6 +2395,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 20);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 14400000);

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -94,9 +94,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -132,6 +132,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _gameAnnouncer = null;
 	
 	protected Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -141,6 +143,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	private void load()
 	{

L2J_Mobius_03.0_Helios/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 6pm (18) 
 # Default: 18
 AltOlyStartTime = 18

L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -68,11 +69,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -47,11 +48,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java

@@ -540,6 +540,7 @@ public class Config
 	public static int WORLD_CHAT_MIN_LEVEL;
 	public static int WORLD_CHAT_POINTS_PER_DAY;
 	public static Duration WORLD_CHAT_INTERVAL;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static long ALT_OLY_CPERIOD;
@@ -2408,6 +2409,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 20);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 14400000);

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -94,9 +94,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -132,6 +132,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _gameAnnouncer = null;
 	
 	protected Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -141,6 +143,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	private void load()
 	{

L2J_Mobius_04.0_GrandCrusade/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 8pm (20) 
 # Default: 20
 AltOlyStartTime = 20

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -68,11 +69,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -46,11 +47,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java

@@ -534,6 +534,7 @@ public class Config
 	public static int WORLD_CHAT_MIN_LEVEL;
 	public static int WORLD_CHAT_POINTS_PER_DAY;
 	public static Duration WORLD_CHAT_INTERVAL;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static long ALT_OLY_CPERIOD;
@@ -2388,6 +2389,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 20);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 14400000);

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -94,9 +94,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -129,6 +129,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _gameAnnouncer = null;
 	
 	protected Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -138,6 +140,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	private void load()
 	{

L2J_Mobius_05.0_Salvation/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 8pm (20) 
 # Default: 20
 AltOlyStartTime = 20

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -68,11 +69,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -44,11 +45,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java

@@ -533,6 +533,7 @@ public class Config
 	public static int WORLD_CHAT_MIN_LEVEL;
 	public static int WORLD_CHAT_POINTS_PER_DAY;
 	public static Duration WORLD_CHAT_INTERVAL;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static long ALT_OLY_CPERIOD;
@@ -2397,6 +2398,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 20);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 14400000);

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -94,9 +94,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -129,6 +129,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _gameAnnouncer = null;
 	
 	protected Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -138,6 +140,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	private void load()
 	{

L2J_Mobius_05.5_EtinasFate/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 8pm (20) 
 # Default: 20
 AltOlyStartTime = 20

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -68,11 +69,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -44,11 +45,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java

@@ -533,6 +533,7 @@ public class Config
 	public static int WORLD_CHAT_MIN_LEVEL;
 	public static int WORLD_CHAT_POINTS_PER_DAY;
 	public static Duration WORLD_CHAT_INTERVAL;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static long ALT_OLY_CPERIOD;
@@ -2404,6 +2405,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 20);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 14400000);

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -94,9 +94,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -129,6 +129,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _gameAnnouncer = null;
 	
 	protected Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -138,6 +140,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	private void load()
 	{

L2J_Mobius_06.0_Fafurion/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 8pm (20) 
 # Default: 20
 AltOlyStartTime = 20

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -68,11 +69,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -44,11 +45,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java

@@ -534,6 +534,7 @@ public class Config
 	public static int WORLD_CHAT_MIN_LEVEL;
 	public static int WORLD_CHAT_POINTS_PER_DAY;
 	public static Duration WORLD_CHAT_INTERVAL;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static long ALT_OLY_CPERIOD;
@@ -2443,6 +2444,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 20);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 14400000);

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -94,9 +94,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -129,6 +129,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _gameAnnouncer = null;
 	
 	protected Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -138,6 +140,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	private void load()
 	{

L2J_Mobius_07.0_PreludeOfWar/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 8pm (20) 
 # Default: 20
 AltOlyStartTime = 20

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -68,11 +69,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -44,11 +45,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java

@@ -535,6 +535,7 @@ public class Config
 	public static int WORLD_CHAT_MIN_LEVEL;
 	public static int WORLD_CHAT_POINTS_PER_DAY;
 	public static Duration WORLD_CHAT_INTERVAL;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static long ALT_OLY_CPERIOD;
@@ -2459,6 +2460,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 20);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 14400000);

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -95,9 +95,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -130,6 +130,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _gameAnnouncer = null;
 	
 	protected Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -139,6 +141,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	private void load()
 	{

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -86,11 +87,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
@@ -42,11 +43,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -86,11 +87,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
@@ -42,11 +43,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -18,6 +18,7 @@ package ai.others.MonumentOfHeroes;
 
 import java.util.List;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Hero;
@@ -86,11 +87,14 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addFirstTalkId(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/OlyBuffer/OlyBuffer.java

@@ -16,6 +16,7 @@
  */
 package ai.others.OlyBuffer;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
@@ -39,11 +40,14 @@ public class OlyBuffer extends AbstractNpcAI
 	};
 	
 	private OlyBuffer()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(OLYMPIAD_BUFFER);
 			addFirstTalkId(OLYMPIAD_BUFFER);
 			addTalkId(OLYMPIAD_BUFFER);
 		}
+	}
 	
 	@Override
 	public String onFirstTalk(Npc npc, Player player)

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java

@@ -77,12 +77,15 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
 	};
 	
 	private OlyManager()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MANAGER);
 			addFirstTalkId(MANAGER);
 			addTalkId(MANAGER);
 			BypassHandler.getInstance().registerHandler(this);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Olympiad.ini

@@ -2,6 +2,10 @@
 #                   Olympiad Settings                   #
 #=======================================================#
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 6pm (18) 
 # Default: 18
 AltOlyStartTime = 18

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java

@@ -731,6 +731,7 @@ public class Config
 	public static boolean ANTI_FARM_IP_ENABLED;
 	public static boolean ANTI_FARM_SUMMON;
 	
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_NUMBER_HEROS_EACH_CLASS;
 	public static boolean ALT_OLY_LOG_FIGHTS;
 	public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS;
@@ -2002,6 +2003,7 @@ public class Config
 	public static void loadOlympConfig()
 	{
 		final PropertiesParser olympiadConfig = new PropertiesParser(OLYMP_CONFIG_FILE);
+		OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 		ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 18);
 		ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 		ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 21600000);

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.handler.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Olympiad;
@@ -40,6 +41,12 @@ public class OlympiadStat implements IUserCommandHandler
 			return false;
 		}
 		
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_GRAND_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_CURRENT_RECORD_FOR_THIS_GRAND_OLYMPIAD_IS_S1_MATCH_ES_S2_WIN_S_AND_S3_DEFEAT_S_YOU_HAVE_EARNED_S4_OLYMPIAD_POINT_S);
 		sm.addNumber(Olympiad.getInstance().getCompetitionDone(player.getObjectId()));
 		sm.addNumber(Olympiad.getInstance().getCompetitionWon(player.getObjectId()));

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -28,6 +28,7 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -69,9 +70,12 @@ public class Hero
 	public static final String ALLY_CREST = "ally_crest";
 	
 	public Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -57,8 +57,8 @@ public class Olympiad
 {
 	protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName());
 	
-	private static Map<Integer, StatSet> NOBLES;
-	private static Map<Integer, StatSet> NOBLES_RANK;
+	private static Map<Integer, StatSet> NOBLES = new ConcurrentHashMap<>();
+	private static Map<Integer, StatSet> NOBLES_RANK = new HashMap<>();
 	protected static List<StatSet> HEROS_TO_BE;
 	private static List<Player> _nonClassBasedRegisters;
 	private static Map<Integer, List<Player>> _classBasedRegisters;
@@ -161,6 +161,8 @@ public class Olympiad
 	}
 	
 	public Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			
@@ -169,6 +171,11 @@ public class Olympiad
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	public static Integer getStadiumCount()
 	{
@@ -177,8 +184,8 @@ public class Olympiad
 	
 	private void load()
 	{
-		NOBLES = new ConcurrentHashMap<>();
-		NOBLES_RANK = new HashMap<>();
+		NOBLES.clear();
+		NOBLES_RANK.clear();
 		
 		boolean loaded = false;
 		try (Connection con = DatabaseFactory.getConnection();

L2J_Mobius_C6_Interlude/dist/game/config/Olympiad.ini

@@ -2,6 +2,10 @@
 #                   Olympiad Settings                   #
 #=======================================================#
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 6pm (18) 
 # Default: 18
 AltOlyStartTime = 18

L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java

@@ -759,6 +759,7 @@ public class Config
 	public static boolean ANTI_FARM_IP_ENABLED;
 	public static boolean ANTI_FARM_SUMMON;
 	
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_NUMBER_HEROS_EACH_CLASS;
 	public static boolean ALT_OLY_LOG_FIGHTS;
 	public static boolean ALT_OLY_SHOW_MONTHLY_WINNERS;
@@ -2055,6 +2056,7 @@ public class Config
 	public static void loadOlympConfig()
 	{
 		final PropertiesParser olympiadConfig = new PropertiesParser(OLYMP_CONFIG_FILE);
+		OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 		ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 18);
 		ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 		ALT_OLY_CPERIOD = olympiadConfig.getLong("AltOlyCPeriod", 21600000);

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.handler.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.olympiad.Olympiad;
@@ -40,6 +41,12 @@ public class OlympiadStat implements IUserCommandHandler
 			return false;
 		}
 		
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_GRAND_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_CURRENT_RECORD_FOR_THIS_GRAND_OLYMPIAD_IS_S1_MATCH_ES_S2_WIN_S_AND_S3_DEFEAT_S_YOU_HAVE_EARNED_S4_OLYMPIAD_POINT_S);
 		sm.addNumber(Olympiad.getInstance().getCompetitionDone(player.getObjectId()));
 		sm.addNumber(Olympiad.getInstance().getCompetitionWon(player.getObjectId()));

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -28,6 +28,7 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.gameserver.data.sql.ClanTable;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -69,9 +70,12 @@ public class Hero
 	public static final String ALLY_CREST = "ally_crest";
 	
 	public Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -57,8 +57,8 @@ public class Olympiad
 {
 	protected static final Logger LOGGER = Logger.getLogger(Olympiad.class.getName());
 	
-	private static Map<Integer, StatSet> NOBLES;
-	private static Map<Integer, StatSet> NOBLES_RANK;
+	private static Map<Integer, StatSet> NOBLES = new ConcurrentHashMap<>();
+	private static Map<Integer, StatSet> NOBLES_RANK = new HashMap<>();
 	protected static List<StatSet> HEROS_TO_BE;
 	private static List<Player> _nonClassBasedRegisters;
 	private static Map<Integer, List<Player>> _classBasedRegisters;
@@ -161,6 +161,8 @@ public class Olympiad
 	}
 	
 	public Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			
@@ -169,6 +171,11 @@ public class Olympiad
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	public static Integer getStadiumCount()
 	{
@@ -177,8 +184,8 @@ public class Olympiad
 	
 	private void load()
 	{
-		NOBLES = new ConcurrentHashMap<>();
-		NOBLES_RANK = new HashMap<>();
+		NOBLES.clear();
+		NOBLES_RANK.clear();
 		
 		boolean loaded = false;
 		try (Connection con = DatabaseFactory.getConnection();

L2J_Mobius_CT_0_Interlude/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 6pm (18) 
 # Default: 18
 AltOlyStartTime = 18

L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -16,6 +16,7 @@
  */
 package ai.others.MonumentOfHeroes;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -56,10 +57,13 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_GRAND_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java

@@ -577,6 +577,7 @@ public class Config
 	public static boolean USE_SAY_FILTER;
 	public static String CHAT_FILTER_CHARS;
 	public static Set<ChatType> BAN_CHAT_CHANNELS;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static int ALT_OLY_MAX_BUFFS;
@@ -2371,6 +2372,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 18);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_MAX_BUFFS = olympiadConfig.getInt("AltOlyMaxBuffs", 5);

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -91,9 +91,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -165,6 +165,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _scheduledValdationTask;
 	
 	Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -174,6 +176,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	public static Integer getStadiumCount()
 	{

L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 6pm (18) 
 # Default: 18
 AltOlyStartTime = 18

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -16,6 +16,7 @@
  */
 package ai.others.MonumentOfHeroes;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -59,10 +60,13 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_GRAND_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java

@@ -588,6 +588,7 @@ public class Config
 	public static boolean USE_SAY_FILTER;
 	public static String CHAT_FILTER_CHARS;
 	public static Set<ChatType> BAN_CHAT_CHANNELS;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static int ALT_OLY_MAX_BUFFS;
@@ -2467,6 +2468,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 18);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_MAX_BUFFS = olympiadConfig.getInt("AltOlyMaxBuffs", 5);

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -92,9 +92,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java

@@ -165,6 +165,8 @@ public class Olympiad extends ListenersContainer
 	protected ScheduledFuture<?> _scheduledValdationTask;
 	
 	Olympiad()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			load();
 			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
@@ -174,6 +176,11 @@ public class Olympiad extends ListenersContainer
 				init();
 			}
 		}
+		else
+		{
+			LOGGER.log(Level.INFO, "Disabled.");
+		}
+	}
 	
 	public static Integer getStadiumCount()
 	{

L2J_Mobius_CT_2.6_HighFive/dist/game/config/Olympiad.ini

@@ -9,6 +9,10 @@
 # Also please understand what you are changing before you do so on a live server.
 # ---------------------------------------------------------------------------
 
+# Enable Olympiad.
+# Default: True
+OlympiadEnabled = True
+
 # Olympiad Start Time in Military hours Default 6pm (18) 
 # Default: 18
 AltOlyStartTime = 18

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java

@@ -16,6 +16,7 @@
  */
 package ai.others.MonumentOfHeroes;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.CommonUtil;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -58,10 +59,13 @@ public class MonumentOfHeroes extends AbstractNpcAI
 	};
 	
 	private MonumentOfHeroes()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			addStartNpc(MONUMENTS);
 			addTalkId(MONUMENTS);
 		}
+	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, Player player)

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java

@@ -16,6 +16,7 @@
  */
 package handlers.usercommandhandlers;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -37,6 +38,12 @@ public class OlympiadStat implements IUserCommandHandler
 	@Override
 	public boolean useUserCommand(int id, Player player)
 	{
+		if (!Config.OLYMPIAD_ENABLED)
+		{
+			player.sendPacket(SystemMessageId.THE_GRAND_OLYMPIAD_GAMES_ARE_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
 		if (id != COMMAND_IDS[0])
 		{
 			return false;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java

@@ -593,6 +593,7 @@ public class Config
 	public static boolean USE_SAY_FILTER;
 	public static String CHAT_FILTER_CHARS;
 	public static Set<ChatType> BAN_CHAT_CHANNELS;
+	public static boolean OLYMPIAD_ENABLED;
 	public static int ALT_OLY_START_TIME;
 	public static int ALT_OLY_MIN;
 	public static int ALT_OLY_MAX_BUFFS;
@@ -2472,6 +2473,7 @@ public class Config
 			
 			// Load Olympiad config file (if exists)
 			final PropertiesParser olympiadConfig = new PropertiesParser(OLYMPIAD_CONFIG_FILE);
+			OLYMPIAD_ENABLED = olympiadConfig.getBoolean("OlympiadEnabled", true);
 			ALT_OLY_START_TIME = olympiadConfig.getInt("AltOlyStartTime", 18);
 			ALT_OLY_MIN = olympiadConfig.getInt("AltOlyMin", 0);
 			ALT_OLY_MAX_BUFFS = olympiadConfig.getInt("AltOlyMaxBuffs", 5);

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java

@@ -92,9 +92,12 @@ public class Hero
 	public static final int ACTION_CASTLE_TAKEN = 3;
 	
 	protected Hero()
+	{
+		if (Config.OLYMPIAD_ENABLED)
 		{
 			init();
 		}
+	}
 	
 	private void init()
 	{