From 1ca3152121eac82eb23584bb757de9b115cb2980 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 14 Oct 2022 04:14:26 +0000 Subject: [PATCH] Fixed BotReportTable calendar schedule calculations. --- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 42 +++++++++---------- .../gameserver/data/BotReportTable.java | 42 +++++++++---------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- .../gameserver/data/BotReportTable.java | 34 ++++++++------- 26 files changed, 470 insertions(+), 430 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java index d130fd408b..b6d9989e47 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java index d130fd408b..b6d9989e47 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java index d130fd408b..b6d9989e47 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java index c2f2d6ba65..e9e60d2dd4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java index e1ceca4ca7..d6eacb32e3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java index c2f2d6ba65..e9e60d2dd4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java index c2f2d6ba65..e9e60d2dd4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java index c2f2d6ba65..e9e60d2dd4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java index c2f2d6ba65..e9e60d2dd4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java index c2f2d6ba65..e9e60d2dd4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java index bb3309057a..756e6a7258 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java index 9b170ca441..0ce8650831 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -77,7 +77,7 @@ public class BotReportTable private Map _reports; private Map _punishments; - BotReportTable() + protected BotReportTable() { if (Config.BOTREPORT_ENABLE) { @@ -120,17 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -220,7 +220,6 @@ public class BotReportTable } final Creature bot = ((Creature) target); - if ((!bot.isPlayer() && !bot.isFakePlayer()) || (bot.isFakePlayer() && !((Npc) bot).getTemplate().isFakePlayerTalkable()) || (target.getObjectId() == reporter.getObjectId())) { return false; @@ -304,14 +303,12 @@ public class BotReportTable } final long curTime = System.currentTimeMillis(); - if (rcd == null) { rcd = new ReportedCharData(); _reports.put(bot.getObjectId(), rcd); } rcd.addReporter(reporterId, curTime); - if (rcdRep == null) { rcdRep = new ReporterCharData(); @@ -418,17 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { @@ -456,7 +453,6 @@ public class BotReportTable { rawIp[i] = Integer.parseInt(rawByte[i]); } - return rawIp[0] | (rawIp[1] << 8) | (rawIp[2] << 16) | (rawIp[3] << 24); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java index 9b170ca441..0ce8650831 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -77,7 +77,7 @@ public class BotReportTable private Map _reports; private Map _punishments; - BotReportTable() + protected BotReportTable() { if (Config.BOTREPORT_ENABLE) { @@ -120,17 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -220,7 +220,6 @@ public class BotReportTable } final Creature bot = ((Creature) target); - if ((!bot.isPlayer() && !bot.isFakePlayer()) || (bot.isFakePlayer() && !((Npc) bot).getTemplate().isFakePlayerTalkable()) || (target.getObjectId() == reporter.getObjectId())) { return false; @@ -304,14 +303,12 @@ public class BotReportTable } final long curTime = System.currentTimeMillis(); - if (rcd == null) { rcd = new ReportedCharData(); _reports.put(bot.getObjectId(), rcd); } rcd.addReporter(reporterId, curTime); - if (rcdRep == null) { rcdRep = new ReporterCharData(); @@ -418,17 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { @@ -456,7 +453,6 @@ public class BotReportTable { rawIp[i] = Integer.parseInt(rawByte[i]); } - return rawIp[0] | (rawIp[1] << 8) | (rawIp[2] << 16) | (rawIp[3] << 24); } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/BotReportTable.java index d130fd408b..b6d9989e47 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/BotReportTable.java index e8c502a87c..233d75e76b 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java index e8c502a87c..233d75e76b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java index e8c502a87c..233d75e76b 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java index e8c502a87c..233d75e76b 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java index e8c502a87c..233d75e76b 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java index fc2744618a..01123e1169 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java index e8c502a87c..233d75e76b 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java index e8c502a87c..233d75e76b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java index e8c502a87c..233d75e76b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java index fc1c7cd3dc..93d8d07471 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java index fc1c7cd3dc..93d8d07471 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java index fc1c7cd3dc..93d8d07471 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -120,16 +120,17 @@ public class BotReportTable long lastResetTime = 0; try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() < c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - lastResetTime = c.getTimeInMillis(); + lastResetTime = currentTime; } catch (Exception e) { @@ -414,16 +415,17 @@ public class BotReportTable { try { - final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; - final Calendar c = Calendar.getInstance(); - c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); - c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (System.currentTimeMillis() > c.getTimeInMillis()) + final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]); + final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]); + final long currentTime = System.currentTimeMillis(); + final Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, hour); + calendar.set(Calendar.MINUTE, minute); + if (calendar.getTimeInMillis() < currentTime) { - c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); + calendar.add(Calendar.DAY_OF_YEAR, 1); } - - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), calendar.getTimeInMillis() - currentTime); } catch (Exception e) {