From 9fd5acd30d62e7fd5e12e03f39abd4f151c8e21b Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 1 Nov 2019 22:02:35 +0000 Subject: [PATCH] Olympiad start/end broadcasts as temporary precaution. --- .../l2jmobius/gameserver/model/olympiad/OlympiadGame.java | 8 ++++++++ .../gameserver/model/olympiad/OlympiadManager.java | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index 42ba2d25e1..e4d58cb8be 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -1379,6 +1379,10 @@ class OlympiadGameTask implements Runnable return false; } + // TODO: Check if this can be removed. + _game._playerOne.broadcastInfo(); + _game._playerTwo.broadcastInfo(); + _game._playerOne.sendPacket(new ExOlympiadUserInfo(_game._playerOne)); _game._playerOne.sendPacket(new ExOlympiadUserInfo(_game._playerTwo)); _game._playerTwo.sendPacket(new ExOlympiadUserInfo(_game._playerTwo)); @@ -1413,6 +1417,10 @@ class OlympiadGameTask implements Runnable } } + // TODO: Check if this can be removed. + _game._playerOne.broadcastInfo(); + _game._playerTwo.broadcastInfo(); + return checkBattleStatus(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index f51b07d839..0542895184 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -145,7 +145,6 @@ class OlympiadManager implements Runnable i--; } } - else if ((readyClasses != null) && existNextOpponents(getRandomClassList(Olympiad.getRegisteredClassBased(), readyClasses))) { try @@ -402,7 +401,6 @@ class OlympiadManager implements Runnable list.remove(second); return opponents; - } protected boolean existNextOpponents(List list)