From 8066c8348f758a02bb46faf90b53093e65f59391 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 8 May 2021 21:17:45 +0000 Subject: [PATCH] Fixed Calendar copying by use of HOUR_OF_DAY. --- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 4 ++-- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 4 ++-- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 4 ++-- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../gameserver/instancemanager/FourSepulchersManager.java | 4 ++-- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 4 ++-- .../gameserver/instancemanager/FourSepulchersManager.java | 4 ++-- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 4 ++-- .../RainbowSpringsChateau/RainbowSpringsChateau.java | 2 +- .../dist/game/data/scripts/instances/AbstractInstance.java | 2 +- .../gameserver/instancemanager/FourSepulchersManager.java | 2 +- .../tasks/FourSepulchersChangeCoolDownTimeTask.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 4 ++-- .../RainbowSpringsChateau/RainbowSpringsChateau.java | 2 +- .../dist/game/data/scripts/instances/AbstractInstance.java | 2 +- .../gameserver/instancemanager/FourSepulchersManager.java | 2 +- .../tasks/FourSepulchersChangeCoolDownTimeTask.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 4 ++-- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- .../org/l2jmobius/gameserver/model/olympiad/Olympiad.java | 2 +- 33 files changed, 42 insertions(+), 42 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index d824e494ed..4492cda3f3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -630,7 +630,7 @@ public class Olympiad extends ListenersContainer currentTime.add(Calendar.MONTH, 1); currentTime.set(Calendar.DAY_OF_MONTH, 1); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); _olympiadEnd = currentTime.getTimeInMillis(); @@ -642,7 +642,7 @@ public class Olympiad extends ListenersContainer { final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index d824e494ed..4492cda3f3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -630,7 +630,7 @@ public class Olympiad extends ListenersContainer currentTime.add(Calendar.MONTH, 1); currentTime.set(Calendar.DAY_OF_MONTH, 1); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); _olympiadEnd = currentTime.getTimeInMillis(); @@ -642,7 +642,7 @@ public class Olympiad extends ListenersContainer { final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index d824e494ed..4492cda3f3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -630,7 +630,7 @@ public class Olympiad extends ListenersContainer currentTime.add(Calendar.MONTH, 1); currentTime.set(Calendar.DAY_OF_MONTH, 1); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); _olympiadEnd = currentTime.getTimeInMillis(); @@ -642,7 +642,7 @@ public class Olympiad extends ListenersContainer { final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index cf9e694197..545a20a037 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -617,7 +617,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index f07830ed8c..e3b805a944 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -617,7 +617,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index f07830ed8c..e3b805a944 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -617,7 +617,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index f07830ed8c..e3b805a944 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -617,7 +617,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 7e4ab757d3..bf9f54ddeb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -618,7 +618,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 1a48f0a574..2218c97468 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -618,7 +618,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 1a48f0a574..2218c97468 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -618,7 +618,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index d093c17138..d2e2ca557e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -342,7 +342,7 @@ public class FourSepulchersManager extends GrandBossManager final Calendar tmp = Calendar.getInstance(); if (tmp.get(Calendar.MINUTE) < _newCycleMin) { - tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1); + tmp.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) - 1); } tmp.set(Calendar.MINUTE, _newCycleMin); _coolDownTimeEnd = tmp.getTimeInMillis(); @@ -1847,7 +1847,7 @@ public class FourSepulchersManager extends GrandBossManager // one hour = 55th min to 55 min of next hour, so we check for this, also check for first launch if ((Calendar.getInstance().get(Calendar.MINUTE) > _newCycleMin) && !_firstTimeRun) { - time.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) + 1); + time.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + 1); } time.set(Calendar.MINUTE, _newCycleMin); if (_firstTimeRun) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 63a3bc38e5..3469c6cafc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -870,7 +870,7 @@ public class Olympiad currentTime.add(Calendar.MONTH, 1); currentTime.set(Calendar.DAY_OF_MONTH, 1); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); _olympiadEnd = currentTime.getTimeInMillis(); @@ -1619,7 +1619,7 @@ public class Olympiad final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index d093c17138..d2e2ca557e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -342,7 +342,7 @@ public class FourSepulchersManager extends GrandBossManager final Calendar tmp = Calendar.getInstance(); if (tmp.get(Calendar.MINUTE) < _newCycleMin) { - tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1); + tmp.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) - 1); } tmp.set(Calendar.MINUTE, _newCycleMin); _coolDownTimeEnd = tmp.getTimeInMillis(); @@ -1847,7 +1847,7 @@ public class FourSepulchersManager extends GrandBossManager // one hour = 55th min to 55 min of next hour, so we check for this, also check for first launch if ((Calendar.getInstance().get(Calendar.MINUTE) > _newCycleMin) && !_firstTimeRun) { - time.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) + 1); + time.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + 1); } time.set(Calendar.MINUTE, _newCycleMin); if (_firstTimeRun) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index de3e17e4c5..bfeac896c5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -878,7 +878,7 @@ public class Olympiad currentTime.add(Calendar.MONTH, 1); currentTime.set(Calendar.DAY_OF_MONTH, 1); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); _olympiadEnd = currentTime.getTimeInMillis(); @@ -1627,7 +1627,7 @@ public class Olympiad final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index a7960f8c98..da2fb9f862 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -887,7 +887,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine final int year = c.get(Calendar.YEAR); final int month = c.get(Calendar.MONTH) + 1; final int day = c.get(Calendar.DAY_OF_MONTH); - final int hour = c.get(Calendar.HOUR); + final int hour = c.get(Calendar.HOUR_OF_DAY); final int mins = c.get(Calendar.MINUTE); _registrationEnds = year + "-" + month + "-" + day + " " + hour + (mins < 10 ? ":0" : ":") + mins; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/AbstractInstance.java index c8464d7b83..8955773878 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/AbstractInstance.java @@ -136,7 +136,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.AM_PM, data.getHour() >= 12 ? 1 : 0); - calendar.set(Calendar.HOUR, data.getHour()); + calendar.set(Calendar.HOUR_OF_DAY, data.getHour()); calendar.set(Calendar.MINUTE, data.getMinute()); calendar.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 1d41086f35..90d89117ef 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -231,7 +231,7 @@ public class FourSepulchersManager final Calendar tmp = Calendar.getInstance(); if (tmp.get(Calendar.MINUTE) < NEW_CYCLE_MIN) { - tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1); + tmp.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) - 1); } tmp.set(Calendar.MINUTE, NEW_CYCLE_MIN); _coolDownTimeEnd = tmp.getTimeInMillis(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java index 07bdf7045b..ee2b208f4e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java @@ -44,7 +44,7 @@ public class FourSepulchersChangeCoolDownTimeTask implements Runnable // also check for first launch if (!manager.isFirstTimeRun() && (Calendar.getInstance().get(Calendar.MINUTE) > manager.getCycleMin())) { - time.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) + 1); + time.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + 1); } time.set(Calendar.MINUTE, manager.getCycleMin()); if (manager.isFirstTimeRun()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 4d0fe54957..1eb24ee2c8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -952,7 +952,7 @@ public class Olympiad extends ListenersContainer currentTime.add(Calendar.MONTH, 1); currentTime.set(Calendar.DAY_OF_MONTH, 1); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); _olympiadEnd = currentTime.getTimeInMillis(); @@ -964,7 +964,7 @@ public class Olympiad extends ListenersContainer { final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index a7960f8c98..da2fb9f862 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -887,7 +887,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine final int year = c.get(Calendar.YEAR); final int month = c.get(Calendar.MONTH) + 1; final int day = c.get(Calendar.DAY_OF_MONTH); - final int hour = c.get(Calendar.HOUR); + final int hour = c.get(Calendar.HOUR_OF_DAY); final int mins = c.get(Calendar.MINUTE); _registrationEnds = year + "-" + month + "-" + day + " " + hour + (mins < 10 ? ":0" : ":") + mins; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java index c8464d7b83..8955773878 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java @@ -136,7 +136,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.AM_PM, data.getHour() >= 12 ? 1 : 0); - calendar.set(Calendar.HOUR, data.getHour()); + calendar.set(Calendar.HOUR_OF_DAY, data.getHour()); calendar.set(Calendar.MINUTE, data.getMinute()); calendar.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 1d41086f35..90d89117ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -231,7 +231,7 @@ public class FourSepulchersManager final Calendar tmp = Calendar.getInstance(); if (tmp.get(Calendar.MINUTE) < NEW_CYCLE_MIN) { - tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1); + tmp.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) - 1); } tmp.set(Calendar.MINUTE, NEW_CYCLE_MIN); _coolDownTimeEnd = tmp.getTimeInMillis(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java index 07bdf7045b..ee2b208f4e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java @@ -44,7 +44,7 @@ public class FourSepulchersChangeCoolDownTimeTask implements Runnable // also check for first launch if (!manager.isFirstTimeRun() && (Calendar.getInstance().get(Calendar.MINUTE) > manager.getCycleMin())) { - time.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) + 1); + time.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + 1); } time.set(Calendar.MINUTE, manager.getCycleMin()); if (manager.isFirstTimeRun()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 0bdfd9cac6..bc035e45dc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -664,7 +664,7 @@ public class Olympiad extends ListenersContainer currentTime.add(Calendar.MONTH, 1); currentTime.set(Calendar.DAY_OF_MONTH, 1); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); _olympiadEnd = currentTime.getTimeInMillis(); @@ -676,7 +676,7 @@ public class Olympiad extends ListenersContainer { final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 1afa27707d..12508ab9c1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 1afa27707d..12508ab9c1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 1afa27707d..12508ab9c1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 1afa27707d..12508ab9c1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 1afa27707d..12508ab9c1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 6bef958745..befb750e4c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -620,7 +620,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 1afa27707d..12508ab9c1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 97a6f746ef..60580c2f43 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -620,7 +620,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 97a6f746ef..60580c2f43 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -620,7 +620,7 @@ public class Olympiad extends ListenersContainer final Calendar currentTime = Calendar.getInstance(); currentTime.set(Calendar.AM_PM, Calendar.AM); - currentTime.set(Calendar.HOUR, 12); + currentTime.set(Calendar.HOUR_OF_DAY, 12); currentTime.set(Calendar.MINUTE, 0); currentTime.set(Calendar.SECOND, 0);