From 60d9d1299c5ed7392590a0269beb438602e27078 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment Date: Sun, 15 Sep 2024 11:42:40 +0300 Subject: [PATCH] Check if Kratei's Cube registration time has passed. --- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- .../instancemanager/games/KrateisCubeManager.java | 9 ++++++++- 16 files changed, 128 insertions(+), 16 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 70086a574c..2a01d996c1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 70086a574c..2a01d996c1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 70086a574c..2a01d996c1 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 70086a574c..2a01d996c1 100644 --- a/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 70086a574c..2a01d996c1 100644 --- a/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 70086a574c..2a01d996c1 100644 --- a/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java index 58d1bd3bb6..0c70ff3298 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/KrateisCubeManager.java @@ -416,8 +416,15 @@ public class KrateisCubeManager implements IXmlReader calendar.set(Calendar.SECOND, 0); _isHalfAnHour = false; } + + final long currentTime = System.currentTimeMillis(); + if (calendar.getTimeInMillis() < currentTime) + { + calendar.add(Calendar.DAY_OF_YEAR, 1); + } + _nextMatchTime = calendar.getTimeInMillis(); - final long lastTime = _nextMatchTime - System.currentTimeMillis(); + final long lastTime = _nextMatchTime - currentTime; _eventTask = ThreadPool.schedule(this::closeRegistration, lastTime); getManagerMessage(KrateiMsgType.INITIALIZED);