Fixed BotReportTable calendar schedule calculations.

This commit is contained in:
MobiusDevelopment 2022-10-14 04:14:26 +00:00
parent 31d35e5c58
commit 1ca3152121
26 changed files with 470 additions and 430 deletions

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -77,7 +77,7 @@ public class BotReportTable
private Map<Integer, ReportedCharData> _reports; private Map<Integer, ReportedCharData> _reports;
private Map<Integer, PunishHolder> _punishments; private Map<Integer, PunishHolder> _punishments;
BotReportTable() protected BotReportTable()
{ {
if (Config.BOTREPORT_ENABLE) if (Config.BOTREPORT_ENABLE)
{ {
@ -120,17 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.HOUR_OF_DAY, hour);
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -220,7 +220,6 @@ public class BotReportTable
} }
final Creature bot = ((Creature) target); final Creature bot = ((Creature) target);
if ((!bot.isPlayer() && !bot.isFakePlayer()) || (bot.isFakePlayer() && !((Npc) bot).getTemplate().isFakePlayerTalkable()) || (target.getObjectId() == reporter.getObjectId())) if ((!bot.isPlayer() && !bot.isFakePlayer()) || (bot.isFakePlayer() && !((Npc) bot).getTemplate().isFakePlayerTalkable()) || (target.getObjectId() == reporter.getObjectId()))
{ {
return false; return false;
@ -304,14 +303,12 @@ public class BotReportTable
} }
final long curTime = System.currentTimeMillis(); final long curTime = System.currentTimeMillis();
if (rcd == null) if (rcd == null)
{ {
rcd = new ReportedCharData(); rcd = new ReportedCharData();
_reports.put(bot.getObjectId(), rcd); _reports.put(bot.getObjectId(), rcd);
} }
rcd.addReporter(reporterId, curTime); rcd.addReporter(reporterId, curTime);
if (rcdRep == null) if (rcdRep == null)
{ {
rcdRep = new ReporterCharData(); rcdRep = new ReporterCharData();
@ -418,17 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.HOUR_OF_DAY, hour);
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {
@ -456,7 +453,6 @@ public class BotReportTable
{ {
rawIp[i] = Integer.parseInt(rawByte[i]); rawIp[i] = Integer.parseInt(rawByte[i]);
} }
return rawIp[0] | (rawIp[1] << 8) | (rawIp[2] << 16) | (rawIp[3] << 24); return rawIp[0] | (rawIp[1] << 8) | (rawIp[2] << 16) | (rawIp[3] << 24);
} }

View File

@ -77,7 +77,7 @@ public class BotReportTable
private Map<Integer, ReportedCharData> _reports; private Map<Integer, ReportedCharData> _reports;
private Map<Integer, PunishHolder> _punishments; private Map<Integer, PunishHolder> _punishments;
BotReportTable() protected BotReportTable()
{ {
if (Config.BOTREPORT_ENABLE) if (Config.BOTREPORT_ENABLE)
{ {
@ -120,17 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.HOUR_OF_DAY, hour);
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -220,7 +220,6 @@ public class BotReportTable
} }
final Creature bot = ((Creature) target); final Creature bot = ((Creature) target);
if ((!bot.isPlayer() && !bot.isFakePlayer()) || (bot.isFakePlayer() && !((Npc) bot).getTemplate().isFakePlayerTalkable()) || (target.getObjectId() == reporter.getObjectId())) if ((!bot.isPlayer() && !bot.isFakePlayer()) || (bot.isFakePlayer() && !((Npc) bot).getTemplate().isFakePlayerTalkable()) || (target.getObjectId() == reporter.getObjectId()))
{ {
return false; return false;
@ -304,14 +303,12 @@ public class BotReportTable
} }
final long curTime = System.currentTimeMillis(); final long curTime = System.currentTimeMillis();
if (rcd == null) if (rcd == null)
{ {
rcd = new ReportedCharData(); rcd = new ReportedCharData();
_reports.put(bot.getObjectId(), rcd); _reports.put(bot.getObjectId(), rcd);
} }
rcd.addReporter(reporterId, curTime); rcd.addReporter(reporterId, curTime);
if (rcdRep == null) if (rcdRep == null)
{ {
rcdRep = new ReporterCharData(); rcdRep = new ReporterCharData();
@ -418,17 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.HOUR_OF_DAY, hour);
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {
@ -456,7 +453,6 @@ public class BotReportTable
{ {
rawIp[i] = Integer.parseInt(rawByte[i]); rawIp[i] = Integer.parseInt(rawByte[i]);
} }
return rawIp[0] | (rawIp[1] << 8) | (rawIp[2] << 16) | (rawIp[3] << 24); return rawIp[0] | (rawIp[1] << 8) | (rawIp[2] << 16) | (rawIp[3] << 24);
} }

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {

View File

@ -120,16 +120,17 @@ public class BotReportTable
long lastResetTime = 0; long lastResetTime = 0;
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() < c.getTimeInMillis()) 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 = currentTime;
lastResetTime = c.getTimeInMillis();
} }
catch (Exception e) catch (Exception e)
{ {
@ -414,16 +415,17 @@ public class BotReportTable
{ {
try try
{ {
final String[] hour = Config.BOTREPORT_RESETPOINT_HOUR; final int hour = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[0]);
final Calendar c = Calendar.getInstance(); final int minute = Integer.parseInt(Config.BOTREPORT_RESETPOINT_HOUR[1]);
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); final long currentTime = System.currentTimeMillis();
c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); final Calendar calendar = Calendar.getInstance();
if (System.currentTimeMillis() > c.getTimeInMillis()) 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(), calendar.getTimeInMillis() - currentTime);
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
} }
catch (Exception e) catch (Exception e)
{ {