Fixed Calendar copying by use of HOUR_OF_DAY.

This commit is contained in:
MobiusDevelopment 2021-05-08 21:17:45 +00:00
parent 00a2dcd7a9
commit 8066c8348f
33 changed files with 42 additions and 42 deletions

View File

@ -630,7 +630,7 @@ public class Olympiad extends ListenersContainer
currentTime.add(Calendar.MONTH, 1);
currentTime.set(Calendar.DAY_OF_MONTH, 1);
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);
_olympiadEnd = currentTime.getTimeInMillis();
@ -642,7 +642,7 @@ public class Olympiad extends ListenersContainer
{
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -630,7 +630,7 @@ public class Olympiad extends ListenersContainer
currentTime.add(Calendar.MONTH, 1);
currentTime.set(Calendar.DAY_OF_MONTH, 1);
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);
_olympiadEnd = currentTime.getTimeInMillis();
@ -642,7 +642,7 @@ public class Olympiad extends ListenersContainer
{
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -630,7 +630,7 @@ public class Olympiad extends ListenersContainer
currentTime.add(Calendar.MONTH, 1);
currentTime.set(Calendar.DAY_OF_MONTH, 1);
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);
_olympiadEnd = currentTime.getTimeInMillis();
@ -642,7 +642,7 @@ public class Olympiad extends ListenersContainer
{
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -617,7 +617,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -617,7 +617,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -617,7 +617,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -617,7 +617,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -618,7 +618,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -618,7 +618,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -618,7 +618,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -342,7 +342,7 @@ public class FourSepulchersManager extends GrandBossManager
final Calendar tmp = Calendar.getInstance();
if (tmp.get(Calendar.MINUTE) < _newCycleMin)
{
tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1);
tmp.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) - 1);
}
tmp.set(Calendar.MINUTE, _newCycleMin);
_coolDownTimeEnd = tmp.getTimeInMillis();
@ -1847,7 +1847,7 @@ public class FourSepulchersManager extends GrandBossManager
// one hour = 55th min to 55 min of next hour, so we check for this, also check for first launch
if ((Calendar.getInstance().get(Calendar.MINUTE) > _newCycleMin) && !_firstTimeRun)
{
time.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) + 1);
time.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + 1);
}
time.set(Calendar.MINUTE, _newCycleMin);
if (_firstTimeRun)

View File

@ -870,7 +870,7 @@ public class Olympiad
currentTime.add(Calendar.MONTH, 1);
currentTime.set(Calendar.DAY_OF_MONTH, 1);
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);
_olympiadEnd = currentTime.getTimeInMillis();
@ -1619,7 +1619,7 @@ public class Olympiad
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -342,7 +342,7 @@ public class FourSepulchersManager extends GrandBossManager
final Calendar tmp = Calendar.getInstance();
if (tmp.get(Calendar.MINUTE) < _newCycleMin)
{
tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1);
tmp.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) - 1);
}
tmp.set(Calendar.MINUTE, _newCycleMin);
_coolDownTimeEnd = tmp.getTimeInMillis();
@ -1847,7 +1847,7 @@ public class FourSepulchersManager extends GrandBossManager
// one hour = 55th min to 55 min of next hour, so we check for this, also check for first launch
if ((Calendar.getInstance().get(Calendar.MINUTE) > _newCycleMin) && !_firstTimeRun)
{
time.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) + 1);
time.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + 1);
}
time.set(Calendar.MINUTE, _newCycleMin);
if (_firstTimeRun)

View File

@ -878,7 +878,7 @@ public class Olympiad
currentTime.add(Calendar.MONTH, 1);
currentTime.set(Calendar.DAY_OF_MONTH, 1);
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);
_olympiadEnd = currentTime.getTimeInMillis();
@ -1627,7 +1627,7 @@ public class Olympiad
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -887,7 +887,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
final int year = c.get(Calendar.YEAR);
final int month = c.get(Calendar.MONTH) + 1;
final int day = c.get(Calendar.DAY_OF_MONTH);
final int hour = c.get(Calendar.HOUR);
final int hour = c.get(Calendar.HOUR_OF_DAY);
final int mins = c.get(Calendar.MINUTE);
_registrationEnds = year + "-" + month + "-" + day + " " + hour + (mins < 10 ? ":0" : ":") + mins;
}

View File

@ -136,7 +136,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
final Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.AM_PM, data.getHour() >= 12 ? 1 : 0);
calendar.set(Calendar.HOUR, data.getHour());
calendar.set(Calendar.HOUR_OF_DAY, data.getHour());
calendar.set(Calendar.MINUTE, data.getMinute());
calendar.set(Calendar.SECOND, 0);

View File

@ -231,7 +231,7 @@ public class FourSepulchersManager
final Calendar tmp = Calendar.getInstance();
if (tmp.get(Calendar.MINUTE) < NEW_CYCLE_MIN)
{
tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1);
tmp.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) - 1);
}
tmp.set(Calendar.MINUTE, NEW_CYCLE_MIN);
_coolDownTimeEnd = tmp.getTimeInMillis();

View File

@ -44,7 +44,7 @@ public class FourSepulchersChangeCoolDownTimeTask implements Runnable
// also check for first launch
if (!manager.isFirstTimeRun() && (Calendar.getInstance().get(Calendar.MINUTE) > manager.getCycleMin()))
{
time.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) + 1);
time.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + 1);
}
time.set(Calendar.MINUTE, manager.getCycleMin());
if (manager.isFirstTimeRun())

View File

@ -952,7 +952,7 @@ public class Olympiad extends ListenersContainer
currentTime.add(Calendar.MONTH, 1);
currentTime.set(Calendar.DAY_OF_MONTH, 1);
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);
_olympiadEnd = currentTime.getTimeInMillis();
@ -964,7 +964,7 @@ public class Olympiad extends ListenersContainer
{
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -887,7 +887,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
final int year = c.get(Calendar.YEAR);
final int month = c.get(Calendar.MONTH) + 1;
final int day = c.get(Calendar.DAY_OF_MONTH);
final int hour = c.get(Calendar.HOUR);
final int hour = c.get(Calendar.HOUR_OF_DAY);
final int mins = c.get(Calendar.MINUTE);
_registrationEnds = year + "-" + month + "-" + day + " " + hour + (mins < 10 ? ":0" : ":") + mins;
}

View File

@ -136,7 +136,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
final Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.AM_PM, data.getHour() >= 12 ? 1 : 0);
calendar.set(Calendar.HOUR, data.getHour());
calendar.set(Calendar.HOUR_OF_DAY, data.getHour());
calendar.set(Calendar.MINUTE, data.getMinute());
calendar.set(Calendar.SECOND, 0);

View File

@ -231,7 +231,7 @@ public class FourSepulchersManager
final Calendar tmp = Calendar.getInstance();
if (tmp.get(Calendar.MINUTE) < NEW_CYCLE_MIN)
{
tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1);
tmp.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) - 1);
}
tmp.set(Calendar.MINUTE, NEW_CYCLE_MIN);
_coolDownTimeEnd = tmp.getTimeInMillis();

View File

@ -44,7 +44,7 @@ public class FourSepulchersChangeCoolDownTimeTask implements Runnable
// also check for first launch
if (!manager.isFirstTimeRun() && (Calendar.getInstance().get(Calendar.MINUTE) > manager.getCycleMin()))
{
time.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) + 1);
time.set(Calendar.HOUR_OF_DAY, Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + 1);
}
time.set(Calendar.MINUTE, manager.getCycleMin());
if (manager.isFirstTimeRun())

View File

@ -664,7 +664,7 @@ public class Olympiad extends ListenersContainer
currentTime.add(Calendar.MONTH, 1);
currentTime.set(Calendar.DAY_OF_MONTH, 1);
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);
_olympiadEnd = currentTime.getTimeInMillis();
@ -676,7 +676,7 @@ public class Olympiad extends ListenersContainer
{
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -620,7 +620,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -619,7 +619,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -620,7 +620,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);

View File

@ -620,7 +620,7 @@ public class Olympiad extends ListenersContainer
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.HOUR_OF_DAY, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);