diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 404be30896..2c90c22efb 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 3fb8598c0d..bdaabf8dc3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -223,6 +223,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); openDoors(); _state = GameState.BATTLE_COUNTDOWN_SECOND; @@ -245,6 +246,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java index 48202f4bf5..403713994a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameTask.java @@ -245,6 +245,7 @@ public class OlympiadGameTask implements Runnable delay = getDelay(BATTLE_START_TIME_FIRST); if (_countDown <= 0) { + _game.makePlayersInvul(); _game.resetDamage(); _stadium.openDoors(); @@ -268,6 +269,7 @@ public class OlympiadGameTask implements Runnable if (_countDown <= 0) { _state = GameState.BATTLE_STARTED; + _game.removePlayersInvul(); } break; }