From 8f62c02c2fc5ab562c7c6f51d0bf86056401d0c7 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 17 Oct 2022 21:22:26 +0000 Subject: [PATCH] Olympiad logger format change. Contributed by CostyKiller. --- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- .../gameserver/model/olympiad/Olympiad.java | 17 +++++++++++++++-- 25 files changed, 375 insertions(+), 50 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 90d901c24b..144cc6b7b4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -284,13 +284,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 90d901c24b..144cc6b7b4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -284,13 +284,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 90d901c24b..144cc6b7b4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -284,13 +284,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 56caa10afd..de589e4d5c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -278,13 +278,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 40f11bad01..a5e51d3e8d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -278,13 +278,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 40f11bad01..a5e51d3e8d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -278,13 +278,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 40f11bad01..a5e51d3e8d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -278,13 +278,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 45b31bb0b1..8667818358 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -279,13 +279,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 304c68d10f..8021573e16 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -279,13 +279,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 304c68d10f..8021573e16 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -279,13 +279,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 304c68d10f..8021573e16 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -279,13 +279,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } 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 dfb0415959..f6e22d14f9 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 @@ -316,13 +316,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 2336c6e57d..69c80da3ee 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -280,13 +280,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 2336c6e57d..69c80da3ee 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -280,13 +280,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } 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 2336c6e57d..69c80da3ee 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 @@ -280,13 +280,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 2336c6e57d..69c80da3ee 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -280,13 +280,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 2336c6e57d..69c80da3ee 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -280,13 +280,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 2336c6e57d..69c80da3ee 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -280,13 +280,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 2336c6e57d..69c80da3ee 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -280,13 +280,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index 2336c6e57d..69c80da3ee 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -280,13 +280,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } 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 efcaeac4b9..5308c3191e 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 @@ -281,13 +281,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } 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 2336c6e57d..69c80da3ee 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 @@ -280,13 +280,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index e473bd02c3..305f2e3eee 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -281,13 +281,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index e473bd02c3..305f2e3eee 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -281,13 +281,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java index e473bd02c3..305f2e3eee 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -281,13 +281,26 @@ public class Olympiad extends ListenersContainer milliToEnd = getMillisToValidationEnd(); } - LOGGER.info("Olympiad System: " + (milliToEnd / 60000) + " minutes until period ends"); + final double numSecs = (milliToEnd / 1000) % 60; + double countDown = ((milliToEnd / 1000.) - numSecs) / 60; + final int numMins = (int) Math.floor(countDown % 60); + countDown = (countDown - numMins) / 60; + final int numHours = (int) Math.floor(countDown % 24); + final int numDays = (int) Math.floor((countDown - numHours) / 24); + + LOGGER.info("Olympiad System: " + numDays + " days, " + numHours + " hours and " + numMins + " mins until period ends."); if (_period == 0) { milliToEnd = getMillisToWeekChange(); + final double numSecs2 = (milliToEnd / 1000) % 60; + double countDown2 = ((milliToEnd / 1000.) - numSecs2) / 60; + final int numMins2 = (int) Math.floor(countDown % 60); + countDown2 = (countDown2 - numMins) / 60; + final int numHours2 = (int) Math.floor(countDown2 % 24); + final int numDays2 = (int) Math.floor((countDown2 - numHours) / 24); - LOGGER.info("Olympiad System: Next weekly change is in " + (milliToEnd / 60000) + " minutes"); + LOGGER.info("Olympiad System: Next weekly change is in " + numDays2 + " days, " + numHours2 + " hours and " + numMins2 + " mins."); } }