lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of the Chronos class.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-02-20 11:17:45 +00:00
parent dd0d74a8e6
commit c16a199407
3419 changed files with 13203 additions and 8113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java vendored
View File

@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.model.Location;
@@ -137,7 +138,7 @@ public class Parade extends AbstractNpcAI
// final long diff = timeLeftMilli(8, 0, 0), cycle = 600000;
// ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle);
LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours.");
LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours.");
}
void load()

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java vendored
View File

@@ -20,6 +20,7 @@ import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -303,7 +304,7 @@ public class TalentShow extends AbstractNpcAI
hourDiff *= 3600000;
minDiff *= 60000;
diff = hourDiff + minDiff;
LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours.");
LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours.");
startQuestTimer("Start", diff, null, null); // first start
}

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java vendored
View File

@@ -19,6 +19,7 @@ package ai.areas.Gracia.AI;
import java.util.Calendar;
import java.util.GregorianCalendar;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.SpawnTable;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.Movie;
@@ -113,7 +114,7 @@ public class Lindvior extends AbstractNpcAI
final GregorianCalendar date = new GregorianCalendar();
date.set(Calendar.MINUTE, RESET_MIN);
date.set(Calendar.HOUR_OF_DAY, RESET_HOUR);
if (System.currentTimeMillis() >= date.getTimeInMillis())
if (Chronos.currentTimeMillis() >= date.getTimeInMillis())
{
date.add(Calendar.DAY_OF_WEEK, 1);
}
@@ -131,6 +132,6 @@ public class Lindvior extends AbstractNpcAI
{
date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1);
}
return date.getTimeInMillis() - System.currentTimeMillis();
return date.getTimeInMillis() - Chronos.currentTimeMillis();
}
}

9
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
@@ -227,7 +228,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
int buffsNow = 0;
final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0);
if (var < System.currentTimeMillis())
if (var < Chronos.currentTimeMillis())
{
buffsNow = getRandom(ZONE_BUFFS_LIST.length);
GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow));
@@ -252,7 +253,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
reenter.set(Calendar.MINUTE, 0);
reenter.set(Calendar.HOUR_OF_DAY, 13);
reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
if (reenter.getTimeInMillis() <= System.currentTimeMillis())
if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis())
{
reenter.add(Calendar.DAY_OF_MONTH, 7);
}
@@ -270,7 +271,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
}
ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1);
}
startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null);
startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null);
}
private void spawnGroupOfMinion(MonsterInstance npc, int[] mobIds)
@@ -316,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
zone.clearSkills();
zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1);
}
startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null);
startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null);
}
else if (event.equalsIgnoreCase("transform"))
{

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java vendored
View File

@@ -22,6 +22,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -285,7 +286,7 @@ public class HallOfErosionAttack extends AbstractNpcAI
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
final SystemMessage sm = new SystemMessage(2100);
sm.addPcName(partyMember);
@@ -323,7 +324,7 @@ public class HallOfErosionAttack extends AbstractNpcAI
{
world = new HEAWorld();
world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID));
((HEAWorld) world).startTime = System.currentTimeMillis();
((HEAWorld) world).startTime = Chronos.currentTimeMillis();
InstanceManager.getInstance().addWorld(world);
LOGGER.info("Hall Of Erosion Attack started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName());
if (player.isInParty())

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java vendored
View File

@@ -22,6 +22,7 @@ import java.util.concurrent.ScheduledFuture;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -287,7 +288,7 @@ public class HallOfErosionDefence extends AbstractNpcAI
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
final SystemMessage sm = new SystemMessage(2100);
sm.addPcName(partyMember);
@@ -325,7 +326,7 @@ public class HallOfErosionDefence extends AbstractNpcAI
{
world = new HEDWorld();
world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID));
((HEDWorld) world).startTime = System.currentTimeMillis();
((HEDWorld) world).startTime = Chronos.currentTimeMillis();
InstanceManager.getInstance().addWorld(world);
LOGGER.info("Hall Of Erosion Defence started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName());
if (player.isInParty())

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -180,7 +181,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);
@@ -226,7 +227,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI
{
world = new HSAWorld();
world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID));
((HSAWorld) world).storeTime[0] = System.currentTimeMillis();
((HSAWorld) world).storeTime[0] = Chronos.currentTimeMillis();
InstanceManager.getInstance().addWorld(world);
LOGGER.info("Hall Of Suffering Attack started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName());
runTumors((HSAWorld) world);
@@ -516,7 +517,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI
&& (world.klanikus.isDead() && world.klodekus.isDead()))
{
world.incStatus();
world.storeTime[1] = System.currentTimeMillis();
world.storeTime[1] = Chronos.currentTimeMillis();
final Long finishDiff = world.storeTime[1] - world.storeTime[0];
if (finishDiff < 1260000)

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlEvent;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -180,7 +181,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);
@@ -226,7 +227,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI
{
world = new HSDWorld();
world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID));
((HSDWorld) world).storeTime[0] = System.currentTimeMillis();
((HSDWorld) world).storeTime[0] = Chronos.currentTimeMillis();
InstanceManager.getInstance().addWorld(world);
LOGGER.info("Hall Of Suffering Defence started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName());
runTumors((HSDWorld) world);
@@ -516,7 +517,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI
&& (world.klanikus.isDead() && world.klodekus.isDead()))
{
world.incStatus();
world.storeTime[1] = System.currentTimeMillis();
world.storeTime[1] = Chronos.currentTimeMillis();
final Long finishDiff = world.storeTime[1] - world.storeTime[0];
if (finishDiff < 1260000)

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@@ -285,7 +286,7 @@ public class HeartInfinityAttack extends AbstractNpcAI
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
final SystemMessage sm = new SystemMessage(2100);
sm.addPcName(partyMember);
@@ -404,7 +405,7 @@ public class HeartInfinityAttack extends AbstractNpcAI
world.ekimus.broadcastPacket(new NpcSay(world.ekimus.getObjectId(), ChatType.SHOUT, world.ekimus.getId(), NpcStringId.I_SHALL_ACCEPT_YOUR_CHALLENGE_S1_COME_AND_DIE_IN_THE_ARMS_OF_IMMORTALITY));
world.hounds.add(addSpawn(HOUND, -179224, 209624, -15504, 16384, false, 0, false, world.getInstanceId()));
world.hounds.add(addSpawn(HOUND, -179880, 209464, -15504, 16384, false, 0, false, world.getInstanceId()));
world.startTime = System.currentTimeMillis();
world.startTime = Chronos.currentTimeMillis();
world.timerTask = ThreadPool.scheduleAtFixedRate(new TimerTask(world), 298 * 1000, 5 * 60 * 1000);
}
@@ -667,7 +668,7 @@ public class HeartInfinityAttack extends AbstractNpcAI
@Override
public void run()
{
final long time = ((_world.startTime + (25 * 60 * 1000)) - System.currentTimeMillis()) / 60000;
final long time = ((_world.startTime + (25 * 60 * 1000)) - Chronos.currentTimeMillis()) / 60000;
if (time == 0)
{
broadCastPacket(_world, new ExShowScreenMessage(NpcStringId.YOU_HAVE_FAILED_AT_S1_S2_THE_INSTANCE_WILL_SHORTLY_EXPIRE, 2, 8000));

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java vendored
View File

@@ -22,6 +22,7 @@ import java.util.concurrent.ScheduledFuture;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@@ -305,7 +306,7 @@ public class HeartInfinityDefence extends AbstractNpcAI
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
final SystemMessage sm = new SystemMessage(2100);
sm.addPcName(partyMember);
@@ -361,7 +362,7 @@ public class HeartInfinityDefence extends AbstractNpcAI
}
}
}
((HIDWorld) world).startTime = System.currentTimeMillis();
((HIDWorld) world).startTime = Chronos.currentTimeMillis();
((HIDWorld) world).finishTask = ThreadPool.schedule(new FinishTask((HIDWorld) world), 30 * 60000);
((HIDWorld) world).timerTask = ThreadPool.scheduleAtFixedRate(new TimerTask((HIDWorld) world), 298 * 1000, 5 * 60 * 1000);
conquestBegins((HIDWorld) world);
@@ -631,7 +632,7 @@ public class HeartInfinityDefence extends AbstractNpcAI
@Override
public void run()
{
final long time = ((_world.startTime + (25 * 60 * 1000)) - System.currentTimeMillis()) / 60000;
final long time = ((_world.startTime + (25 * 60 * 1000)) - Chronos.currentTimeMillis()) / 60000;
if (time == 0)
{
conquestConclusion(_world);

13
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@@ -853,7 +854,7 @@ public class SeedOfDestruction extends AbstractNpcAI
return false;
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), INSTANCE_ID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
final SystemMessage sm = (new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET));
sm.addPcName(channelMember);
@@ -901,7 +902,7 @@ public class SeedOfDestruction extends AbstractNpcAI
return 0;
}
world = new SODWorld(System.currentTimeMillis() + 5400000);
world = new SODWorld(Chronos.currentTimeMillis() + 5400000);
world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCE_ID));
InstanceManager.getInstance().addWorld(world);
spawnState((SODWorld) world);
@@ -921,7 +922,7 @@ public class SeedOfDestruction extends AbstractNpcAI
if (player.getParty() == null)
{
player.sendMessage("Welcome to Seed of Destruction. Time to finish the instance is 130 minutes.");
InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCE_ID, (System.currentTimeMillis()));
InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCE_ID, (Chronos.currentTimeMillis()));
teleportplayer(player, teleto, (SODWorld) world);
if (InstanceManager.getInstance().getInstance(instanceId).isRemoveBuffEnabled())
{
@@ -934,7 +935,7 @@ public class SeedOfDestruction extends AbstractNpcAI
for (PlayerInstance channelMember : player.getParty().getCommandChannel().getMembers())
{
player.sendMessage("Welcome to Seed of Destruction. Time to finish the instance is 130 minutes.");
InstanceManager.getInstance().setInstanceTime(channelMember.getObjectId(), INSTANCE_ID, (System.currentTimeMillis()));
InstanceManager.getInstance().setInstanceTime(channelMember.getObjectId(), INSTANCE_ID, (Chronos.currentTimeMillis()));
teleportplayer(channelMember, teleto, (SODWorld) world);
if (InstanceManager.getInstance().getInstance(instanceId).isRemoveBuffEnabled())
{
@@ -948,7 +949,7 @@ public class SeedOfDestruction extends AbstractNpcAI
for (PlayerInstance partyMember : player.getParty().getMembers())
{
player.sendMessage("Welcome to Seed of Destruction. Time to finish the instance is 130 minutes.");
InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCE_ID, (System.currentTimeMillis()));
InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCE_ID, (Chronos.currentTimeMillis()));
teleportplayer(partyMember, teleto, (SODWorld) world);
if (InstanceManager.getInstance().getInstance(instanceId).isRemoveBuffEnabled())
{
@@ -1121,7 +1122,7 @@ public class SeedOfDestruction extends AbstractNpcAI
reenter.set(Calendar.MINUTE, RESET_MIN);
reenter.set(Calendar.HOUR_OF_DAY, RESET_HOUR);
// if time is >= RESET_HOUR - roll to the next day
if (reenter.getTimeInMillis() <= System.currentTimeMillis())
if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis())
{
reenter.add(Calendar.DAY_OF_MONTH, 1);
}

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java vendored
View File

@@ -27,6 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.DoorData;
import org.l2jmobius.gameserver.data.xml.SkillData;
@@ -798,7 +799,7 @@ public class TowerOfNaia extends AbstractNpcAI
private void markElpyRespawn()
{
final long respawnTime = (getRandom(43200, 216000) * 1000) + System.currentTimeMillis();
final long respawnTime = (getRandom(43200, 216000) * 1000) + Chronos.currentTimeMillis();
GlobalVariablesManager.getInstance().set("elpy_respawn_time", respawnTime);
}
@@ -822,13 +823,13 @@ public class TowerOfNaia extends AbstractNpcAI
private void spawnElpy()
{
final long respawnTime = GlobalVariablesManager.getInstance().getLong("elpy_respawn_time", 0);
if (respawnTime <= System.currentTimeMillis())
if (respawnTime <= Chronos.currentTimeMillis())
{
addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false);
}
else
{
ThreadPool.schedule(() -> addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false), respawnTime - System.currentTimeMillis());
ThreadPool.schedule(() -> addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false), respawnTime - Chronos.currentTimeMillis());
}
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.areas.Hellbound.Instances.DemonPrinceFloor;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
@@ -143,7 +144,7 @@ public class DemonPrinceFloor extends AbstractInstance
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
party.broadcastPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addPcName(partyMember));
return false;

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.areas.Hellbound.Instances.RankuFloor;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
@@ -141,7 +142,7 @@ public class RankuFloor extends AbstractInstance
}
final Long reenterTime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID);
if (System.currentTimeMillis() < reenterTime)
if (Chronos.currentTimeMillis() < reenterTime)
{
party.broadcastPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addPcName(partyMember));
return false;

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java vendored
View File

@@ -19,6 +19,7 @@ package ai.areas.Rune.RuneCastle.Venom;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
@@ -110,7 +111,7 @@ public class Venom extends AbstractNpcAI
setCastleSiegeStartId(this::onSiegeStart, CASTLE);
setCastleSiegeFinishId(this::onSiegeFinish, CASTLE);
final long currentTime = System.currentTimeMillis();
final long currentTime = Chronos.currentTimeMillis();
final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis();
if ((currentTime > (startSiegeDate - (HOURS_BEFORE * 360000))) && (currentTime < startSiegeDate))
{

13
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.MountType;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
@@ -168,14 +169,14 @@ public class Antharas extends AbstractNpcAI
_antharas = (GrandBossInstance) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0);
_antharas.setCurrentHpMp(curr_hp, curr_mp);
addBoss(_antharas);
_lastAttack = System.currentTimeMillis();
_lastAttack = Chronos.currentTimeMillis();
startQuestTimer("CHECK_ATTACK", 60000, _antharas, null);
startQuestTimer("SPAWN_MINION", 300000, _antharas, null);
break;
}
case DEAD:
{
final long remain = respawnTime - System.currentTimeMillis();
final long remain = respawnTime - Chronos.currentTimeMillis();
if (remain > 0)
{
startQuestTimer("CLEAR_STATUS", remain, null, null);
@@ -271,7 +272,7 @@ public class Antharas extends AbstractNpcAI
_antharas.setRandomWalking(false);
_antharas.teleToLocation(181323, 114850, -7623, 32542);
setStatus(IN_FIGHT);
_lastAttack = System.currentTimeMillis();
_lastAttack = Chronos.currentTimeMillis();
zone.broadcastPacket(new PlaySound("BS02_A"));
startQuestTimer("CAMERA_1", 23, _antharas, null);
break;
@@ -366,7 +367,7 @@ public class Antharas extends AbstractNpcAI
}
case "CHECK_ATTACK":
{
if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis()))
if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis()))
{
setStatus(ALIVE);
for (Creature creature : zone.getCharactersInside())
@@ -618,7 +619,7 @@ public class Antharas extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon, Skill skill)
{
_lastAttack = System.currentTimeMillis();
_lastAttack = Chronos.currentTimeMillis();
if (npc.getId() == BOMBER)
{
if (npc.calculateDistance3D(attacker) < 230)
@@ -766,7 +767,7 @@ public class Antharas extends AbstractNpcAI
private void setRespawn(long respawnTime)
{
GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime);
}
private final void refreshAiParams(PlayerInstance attacker, int damage)

15
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java vendored
View File

@@ -17,6 +17,7 @@
package ai.bosses.Baium;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -134,7 +135,7 @@ public class Baium extends AbstractNpcAI
{
_baium = (GrandBossInstance) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0);
_baium.setCurrentHpMp(curr_hp, curr_mp);
_lastAttack = System.currentTimeMillis();
_lastAttack = Chronos.currentTimeMillis();
addBoss(_baium);
for (Location loc : ARCHANGEL_LOC)
@@ -147,7 +148,7 @@ public class Baium extends AbstractNpcAI
}
case DEAD:
{
final long remain = respawnTime - System.currentTimeMillis();
final long remain = respawnTime - Chronos.currentTimeMillis();
if (remain > 0)
{
startQuestTimer("CLEAR_STATUS", remain, null, null);
@@ -207,7 +208,7 @@ public class Baium extends AbstractNpcAI
_baium.disableCoreAI(true);
_baium.setRandomWalking(false);
addBoss(_baium);
_lastAttack = System.currentTimeMillis();
_lastAttack = Chronos.currentTimeMillis();
startQuestTimer("WAKEUP_ACTION", 50, _baium, null);
startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, null);
startQuestTimer("SOCIAL_ACTION", 10000, _baium, player);
@@ -372,7 +373,7 @@ public class Baium extends AbstractNpcAI
}
case "CHECK_ATTACK":
{
if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis()))
if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis()))
{
cancelQuestTimers("SELECT_TARGET");
notifyEvent("CLEAR_ZONE", null, null);
@@ -381,7 +382,7 @@ public class Baium extends AbstractNpcAI
}
else if (npc != null)
{
if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)))
if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)))
{
npc.setTarget(npc);
npc.doCast(HEAL_OF_BAIUM.getSkill());
@@ -482,7 +483,7 @@ public class Baium extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon, Skill skill)
{
_lastAttack = System.currentTimeMillis();
_lastAttack = Chronos.currentTimeMillis();
if (npc.getId() == BAIUM)
{
if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill()))
@@ -657,7 +658,7 @@ public class Baium extends AbstractNpcAI
private void setRespawn(long respawnTime)
{
GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", Chronos.currentTimeMillis() + respawnTime);
}
private void manageSkills(Npc npc)

9
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.xml.DoorData;
@@ -109,7 +110,7 @@ public class Beleth extends AbstractNpcAI
final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis();
if (time > 0)
{
startQuestTimer("BELETH_UNLOCK", time, null, null);
@@ -350,7 +351,7 @@ public class Beleth extends AbstractNpcAI
c.setImmobilized(false);
}
_lastAttack = System.currentTimeMillis();
_lastAttack = Chronos.currentTimeMillis();
startQuestTimer("CHECK_ATTACK", 60000, null, null);
startQuestTimer("SPAWN25", 60000, null, null);
break;
@@ -508,7 +509,7 @@ public class Beleth extends AbstractNpcAI
}
case "CHECK_ATTACK":
{
if ((_lastAttack + 900000) < System.currentTimeMillis())
if ((_lastAttack + 900000) < Chronos.currentTimeMillis())
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
for (Creature creature : ZONE.getCharactersInside())
@@ -708,7 +709,7 @@ public class Beleth extends AbstractNpcAI
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatSet(REAL_BELETH, info);
startQuestTimer("BELETH_UNLOCK", respawnTime, null, null);
deleteAll();

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
@@ -89,7 +90,7 @@ public class Core extends AbstractNpcAI
if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
{
// Load the unlock date and time for Core from DB.
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis();
// If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired.
if (temp > 0)
{
@@ -206,7 +207,7 @@ public class Core extends AbstractNpcAI
startQuestTimer("core_unlock", respawnTime, null, null);
// Also save the respawn time so that the info is maintained past reboots.
final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatSet(CORE, info);
startQuestTimer("despawn_minions", 20000, null, null);
cancelQuestTimers("spawn_minion");

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.bosses.DrChaos;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -68,7 +69,7 @@ public class DrChaos extends AbstractNpcAI
// Load the reset date and time for Dr. Chaos from DB.
if (status == DEAD)
{
final long temp = (info.getLong("respawn_time") - System.currentTimeMillis());
final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis());
if (temp > 0)
{
startQuestTimer("reset_drchaos", temp, null, null, false);
@@ -97,7 +98,7 @@ public class DrChaos extends AbstractNpcAI
golem.setRunning();
// start monitoring Dr. Chaos's inactivity
_lastAttackVsGolem = System.currentTimeMillis();
_lastAttackVsGolem = Chronos.currentTimeMillis();
startQuestTimer("golem_despawn", 60000, golem, null, true);
}
// Spawn the regular NPC.
@@ -118,7 +119,7 @@ public class DrChaos extends AbstractNpcAI
// despawn the live Dr. Chaos after 30 minutes of inactivity
else if (event.equalsIgnoreCase("golem_despawn") && (npc != null))
{
if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < Chronos.currentTimeMillis()))
{
final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
@@ -156,7 +157,7 @@ public class DrChaos extends AbstractNpcAI
golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
// start monitoring Dr. Chaos's inactivity
_lastAttackVsGolem = System.currentTimeMillis();
_lastAttackVsGolem = Chronos.currentTimeMillis();
startQuestTimer("golem_despawn", 60000, golem, null, true);
// Delete Dr. Chaos after spawned the war golem.
@@ -242,7 +243,7 @@ public class DrChaos extends AbstractNpcAI
// also save the respawn time so that the info is maintained past reboots
final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info);
return null;
}

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -91,7 +92,7 @@ public class Orfen extends AbstractNpcAI
if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD)
{
// load the unlock date and time for Orfen from DB
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis();
// if Orfen is locked until a certain time, mark it so and start the unlock timer
// the unlock time has not yet expired.
if (temp > 0)
@@ -325,7 +326,7 @@ public class Orfen extends AbstractNpcAI
startQuestTimer("orfen_unlock", respawnTime, null, null);
// also save the respawn time so that the info is maintained past reboots
final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatSet(ORFEN, info);
cancelQuestTimer("check_minion_loc", npc, null);
cancelQuestTimer("check_orfen_pos", npc, null);

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Location;
@@ -93,7 +94,7 @@ public class QueenAnt extends AbstractNpcAI
if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD)
{
// load the unlock date and time for queen ant from DB
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis();
// if queen ant is locked until a certain time, mark it so and start the unlock timer
// the unlock time has not yet expired.
if (temp > 0)
@@ -354,7 +355,7 @@ public class QueenAnt extends AbstractNpcAI
cancelQuestTimer("heal", null, null);
// also save the respawn time so that the info is maintained past reboots
final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatSet(QUEEN, info);
_nurses.clear();
_larva.deleteMe();

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.bosses.QueenShyeed;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
@@ -85,7 +86,7 @@ public class QueenShyeed extends AbstractNpcAI
private void spawnShyeed()
{
final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0);
final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0;
final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0;
if (remain > 0)
{
startQuestTimer("respawn", remain, null, null);
@@ -101,7 +102,7 @@ public class QueenShyeed extends AbstractNpcAI
private void startRespawn()
{
final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN);
GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime));
GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime));
startQuestTimer("respawn", respawnTime, null, null);
// MOB_BUFF_ZONE.setEnabled(false);
MOB_BUFF_DISPLAY_ZONE.setEnabled(false);

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.bosses.Sailren;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
@@ -71,7 +72,7 @@ public class Sailren extends AbstractNpcAI
addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN);
addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN);
final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis();
final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis();
if (remain > 0)
{
STATUS = Status.DEAD;
@@ -118,7 +119,7 @@ public class Sailren extends AbstractNpcAI
{
takeItems(player, GAZKH, 1);
STATUS = Status.IN_FIGHT;
_lastAttack = System.currentTimeMillis();
_lastAttack = Chronos.currentTimeMillis();
for (PlayerInstance member : player.getParty().getMembers())
{
if (member.isInsideRadius3D(npc, 1000))
@@ -237,7 +238,7 @@ public class Sailren extends AbstractNpcAI
}
case "CHECK_ATTACK":
{
if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis()))
if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis()))
{
cancelQuestTimer("TIME_OUT", null, null);
notifyEvent("TIME_OUT", null, null);
@@ -257,7 +258,7 @@ public class Sailren extends AbstractNpcAI
{
if (zone.isCharacterInZone(attacker))
{
_lastAttack = System.currentTimeMillis();
_lastAttack = Chronos.currentTimeMillis();
}
return super.onAttack(npc, attacker, damage, isSummon);
}
@@ -274,7 +275,7 @@ public class Sailren extends AbstractNpcAI
STATUS = Status.DEAD;
addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000);
final long respawnTime = RESPAWN * 3600000;
GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime);
GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime);
cancelQuestTimer("CHECK_ATTACK", null, null);
cancelQuestTimer("TIME_OUT", null, null);
startQuestTimer("CLEAR_STATUS", respawnTime, null, null);

13
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.MountType;
@@ -128,7 +129,7 @@ public class Valakas extends AbstractNpcAI
if (status == DEAD)
{
// load the unlock date and time for valakas from DB
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis();
if (temp > 0)
{
// The time has not yet expired. Mark Valakas as currently locked (dead).
@@ -167,7 +168,7 @@ public class Valakas extends AbstractNpcAI
if (status == FIGHTING)
{
// stores current time for inactivity task.
_timeTracker = System.currentTimeMillis();
_timeTracker = Chronos.currentTimeMillis();
startQuestTimer("regen_task", 60000, valakas, null, true);
startQuestTimer("skill_task", 2000, valakas, null, true);
@@ -195,7 +196,7 @@ public class Valakas extends AbstractNpcAI
if (event.equalsIgnoreCase("beginning"))
{
// Stores current time
_timeTracker = System.currentTimeMillis();
_timeTracker = Chronos.currentTimeMillis();
// Teleport Valakas to his lair.
npc.teleToLocation(VALAKAS_LAIR);
@@ -219,7 +220,7 @@ public class Valakas extends AbstractNpcAI
else if (event.equalsIgnoreCase("regen_task"))
{
// Inactivity task - 15min
if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis()))
{
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
npc.teleToLocation(VALAKAS_REGENERATION_LOC);
@@ -415,7 +416,7 @@ public class Valakas extends AbstractNpcAI
npc.setTarget(attacker);
npc.doCast(SkillData.getInstance().getSkill(4258, 1));
}
_timeTracker = System.currentTimeMillis();
_timeTracker = Chronos.currentTimeMillis();
return super.onAttack(npc, attacker, damage, isSummon);
}
@@ -446,7 +447,7 @@ public class Valakas extends AbstractNpcAI
startQuestTimer("valakas_unlock", respawnTime, null, null);
// also save the respawn time so that the info is maintained past reboots
final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatSet(VALAKAS, info);
return super.onKill(npc, killer, isSummon);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java vendored
View File

@@ -47,8 +47,8 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.model.siege.Castle.CastleFunction;
import org.l2jmobius.gameserver.model.siege.Fort;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExShowCropInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExShowCropSetting;

13
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.others.PriestOfBlessing;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -110,15 +111,15 @@ public class PriestOfBlessing extends AbstractNpcAI
{
final String value = player.getVariables().getString("PriestOfBlessing_voice", "");
final long reuseTime = value.isEmpty() ? 0 : Long.parseLong(value);
if (System.currentTimeMillis() > reuseTime)
if (Chronos.currentTimeMillis() > reuseTime)
{
takeItems(player, Inventory.ADENA_ID, PRICE_VOICE);
giveItems(player, NEVIT_VOICE, 1);
player.getVariables().set("PriestOfBlessing_voice", Long.toString(System.currentTimeMillis() + (20 * 3600000)));
player.getVariables().set("PriestOfBlessing_voice", Long.toString(Chronos.currentTimeMillis() + (20 * 3600000)));
}
else
{
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000;
final long remainingTime = (reuseTime - Chronos.currentTimeMillis()) / 1000;
final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
@@ -139,17 +140,17 @@ public class PriestOfBlessing extends AbstractNpcAI
{
final String value = player.getVariables().getString("PriestOfBlessing_hg_" + index, "");
final long reuseTime = value.isEmpty() ? 0 : Long.parseLong(value);
if (System.currentTimeMillis() > reuseTime)
if (Chronos.currentTimeMillis() > reuseTime)
{
final int[] hg = HOURGLASSES[index];
final int nevitHourglass = hg[getRandom(0, hg.length - 1)];
takeItems(player, Inventory.ADENA_ID, priceHourglass);
giveItems(player, nevitHourglass, 1);
player.getVariables().set("PriestOfBlessing_hg_" + index, Long.toString(System.currentTimeMillis() + (20 * 3600000)));
player.getVariables().set("PriestOfBlessing_hg_" + index, Long.toString(Chronos.currentTimeMillis() + (20 * 3600000)));
}
else
{
final long remainingTime = (reuseTime - System.currentTimeMillis()) / 1000;
final long remainingTime = (reuseTime - Chronos.currentTimeMillis()) / 1000;
final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@@ -32,6 +32,7 @@ import java.util.concurrent.ScheduledFuture;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.SpawnTable;
@@ -180,7 +181,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
// XXX _rainbow.siegeEnds();
ThreadPool.schedule(new SetFinalAttackers(), _rainbow.getNextSiegeTime());
setRegistrationEndString((_rainbow.getNextSiegeTime() + System.currentTimeMillis()) - 3600000);
setRegistrationEndString((_rainbow.getNextSiegeTime() + Chronos.currentTimeMillis()) - 3600000);
// Teleport out of the arenas is made 2 mins after game ends
ThreadPool.schedule(new TeleportBack(), 120000);
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java vendored
View File

@@ -16,6 +16,7 @@
*/
package events.FreyaCelebration;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -79,7 +80,7 @@ public class FreyaCelebration extends LongTimeEvent
{
if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1)
{
final long currentTime = System.currentTimeMillis();
final long currentTime = Chronos.currentTimeMillis();
final long reuseTime = player.getVariables().getLong(RESET_VAR, 0);
if (currentTime > reuseTime)
{

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java vendored
View File

@@ -16,6 +16,7 @@
*/
package events.GiftOfVitality;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -93,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent
case "vitality":
{
final long reuse = player.getVariables().getLong(REUSE, 0);
if (reuse > System.currentTimeMillis())
if (reuse > Chronos.currentTimeMillis())
{
final long remainingTime = (reuse - System.currentTimeMillis()) / 1000;
final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000;
final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
@@ -109,7 +110,7 @@ public class GiftOfVitality extends LongTimeEvent
{
player.doCast(GIFT_OF_VITALITY.getSkill());
player.doSimultaneousCast(JOY_OF_VITALITY.getSkill());
player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000));
player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000));
htmltext = "4306-okvitality.htm";
}
break;

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java vendored
View File

@@ -16,6 +16,7 @@
*/
package events.LoveYourGatekeeper;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -58,9 +59,9 @@ public class LoveYourGatekeeper extends LongTimeEvent
if (player.getAdena() >= PRICE)
{
final long reuse = player.getVariables().getLong(REUSE, 0);
if (reuse > System.currentTimeMillis())
if (reuse > Chronos.currentTimeMillis())
{
final long remainingTime = (reuse - System.currentTimeMillis()) / 1000;
final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000;
final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
@@ -73,7 +74,7 @@ public class LoveYourGatekeeper extends LongTimeEvent
{
takeItems(player, Inventory.ADENA_ID, PRICE);
giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1);
player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000));
player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000));
}
}
else

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java vendored
View File

@@ -16,6 +16,7 @@
*/
package events.MasterOfEnchanting;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
@@ -86,7 +87,7 @@ public class MasterOfEnchanting extends LongTimeEvent
}
else if (event.equalsIgnoreCase("buy_scroll_24"))
{
final long curTime = System.currentTimeMillis();
final long curTime = Chronos.currentTimeMillis();
final String value = player.getVariables().getString("MasterOfEnchanting", "");
final long reuse = value.equals("") ? 0 : Long.parseLong(value);
if (player.getCreateDate().after(getEventPeriod().getStartDate()))
@@ -100,7 +101,7 @@ public class MasterOfEnchanting extends LongTimeEvent
{
takeItems(player, Inventory.ADENA_ID, SCROLL_24_PRICE);
giveItems(player, MASTER_YOGI_SCROLL, 24);
player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000)));
player.getVariables().set("MasterOfEnchanting", Long.toString(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000)));
htmltext = "32599-scroll24.htm";
}
else
@@ -134,7 +135,7 @@ public class MasterOfEnchanting extends LongTimeEvent
{
takeItems(player, Inventory.ADENA_ID, SCROLL_24_PRICE);
giveItems(player, MASTER_YOGI_SCROLL, 24);
player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000)));
player.getVariables().set("MasterOfEnchanting", Long.toString(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000)));
htmltext = "32599-scroll24.htm";
}
else

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java vendored
View File

@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.SkillData;
@@ -324,7 +325,7 @@ public class SavingSanta extends LongTimeEvent
{
if (_rewardedPlayers.containsKey(pl.getAccountName()))
{
final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName());
final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName());
if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS)
{
continue;
@@ -333,7 +334,7 @@ public class SavingSanta extends LongTimeEvent
else
{
final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0);
if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS)
if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS)
{
_rewardedPlayers.put(pl.getAccountName(), time);
continue;
@@ -343,8 +344,8 @@ public class SavingSanta extends LongTimeEvent
final int locy = (int) (pl.getY() + (Math.pow(-1, getRandom(1, 2)) * 50));
final int heading = Util.calculateHeadingFrom(locx, locy, pl.getX(), pl.getY());
final Npc santa = addSpawn(HOLIDAY_SANTA_ID, locx, locy, pl.getZ(), heading, false, 30000);
_rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis());
player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis());
_rewardedPlayers.put(pl.getAccountName(), Chronos.currentTimeMillis());
player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis());
startQuestTimer("SantaRewarding0", 500, santa, pl);
}
}
@@ -437,7 +438,7 @@ public class SavingSanta extends LongTimeEvent
else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF)
{
startQuestTimer("SantaBlessings", 15000, null, null);
final long currentTime = System.currentTimeMillis();
final long currentTime = Chronos.currentTimeMillis();
for (Npc santaHelper1 : _santaHelpers)
{
for (PlayerInstance plb : World.getInstance().getVisibleObjects(santaHelper1, PlayerInstance.class))

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.Calendar;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.CHSiegeManager;
@@ -163,7 +164,7 @@ public class AdminCHSiege implements IAdminCommandHandler
c.set(Calendar.HOUR_OF_DAY, h);
c.set(Calendar.MINUTE, min);
c.set(Calendar.SECOND, 0);
if (c.getTimeInMillis() > System.currentTimeMillis())
if (c.getTimeInMillis() > Chronos.currentTimeMillis())
{
activeChar.sendMessage(hall.getName() + " siege: " + c.getTime());
hall.setNextSiegeDate(c.getTimeInMillis());

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
import java.util.Collection;
import java.util.StringTokenizer;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
import org.l2jmobius.gameserver.model.CursedWeapon;
@@ -209,7 +210,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
{
activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true);
}
cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000));
cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000));
cw.reActivate();
}
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
import java.util.Calendar;
import java.util.StringTokenizer;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.SoDManager;
import org.l2jmobius.gameserver.instancemanager.SoIManager;
@@ -73,7 +74,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
if (SoDManager.getInstance().getSoDTimeForNextStateChange() > 0)
{
final Calendar nextChangeDate = Calendar.getInstance();
nextChangeDate.setTimeInMillis(System.currentTimeMillis() + SoDManager.getInstance().getSoDTimeForNextStateChange());
nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + SoDManager.getInstance().getSoDTimeForNextStateChange());
html.replace("%sodtime%", nextChangeDate.getTime().toString());
}
else

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.StringTokenizer;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.World;
@@ -124,7 +125,7 @@ public class AdminInstanceZone implements IAdminCommandHandler
{
int hours = 0;
int minutes = 0;
final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000;
final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000;
if (remainingTime > 0)
{
hours = (int) (remainingTime / 3600);

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java vendored
View File

@@ -25,6 +25,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -233,7 +234,7 @@ public class AdminPunishment implements IAdminCommandHandler
long expirationTime = Integer.parseInt(exp);
if (expirationTime > 0)
{
expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000);
expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000);
}
final PunishmentAffect affect = PunishmentAffect.getByName(af);

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java vendored
View File

@@ -24,6 +24,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.GameServer;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.cache.HtmCache;
@@ -60,7 +61,7 @@ public class AdminServerInfo implements IAdminCommandHandler
html.replace("%gameTime%", GameTimeController.getInstance().getGameHour() + ":" + GameTimeController.getInstance().getGameMinute());
html.replace("%dayNight%", GameTimeController.getInstance().isNight() ? "Night" : "Day");
html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled");
html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis())));
html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis())));
html.replace("%serverUpTime%", getServerUpTime());
html.replace("%onlineAll%", getPlayersCount("ALL"));
html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE"));
@@ -76,7 +77,7 @@ public class AdminServerInfo implements IAdminCommandHandler
private String getServerUpTime()
{
long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis();
long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis();
final long days = TimeUnit.MILLISECONDS.toDays(time);
time -= TimeUnit.DAYS.toMillis(days);

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.Calendar;
import java.util.Collection;
import java.util.StringTokenizer;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
@@ -116,11 +117,11 @@ public class AdminTerritoryWar implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_territory_war_start"))
{
TerritoryWarManager.getInstance().setTWStartTimeInMillis(System.currentTimeMillis());
TerritoryWarManager.getInstance().setTWStartTimeInMillis(Chronos.currentTimeMillis());
}
else if (command.equalsIgnoreCase("admin_territory_war_end"))
{
TerritoryWarManager.getInstance().setTWStartTimeInMillis(System.currentTimeMillis() - TerritoryWarManager.WARLENGTH);
TerritoryWarManager.getInstance().setTWStartTimeInMillis(Chronos.currentTimeMillis() - TerritoryWarManager.WARLENGTH);
}
else if (command.equalsIgnoreCase("admin_territory_wards_list"))
{

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Map.Entry;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.handler.IBypassHandler;
@@ -133,7 +134,7 @@ public class FindPvP implements IBypassHandler
player.setSpawnProtection(true);
if (!player.isGM())
{
player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME);
player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME);
player.startPvPFlag();
}
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.punishmenthandlers;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.handler.IPunishmentHandler;
import org.l2jmobius.gameserver.model.World;
@@ -126,7 +127,7 @@ public class ChatBanHandler implements IPunishmentHandler
*/
private void applyToPlayer(PunishmentTask task, PlayerInstance player)
{
final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000;
final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000;
if (delay > 0)
{
player.sendMessage("You've been chat banned for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds."));

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java vendored
View File

@@ -17,6 +17,7 @@
package handlers.punishmenthandlers;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.LoginServerThread;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.handler.IPunishmentHandler;
@@ -186,7 +187,7 @@ public class JailHandler implements IPunishmentHandler
player.sendPacket(msg);
if (task != null)
{
final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000;
final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000;
if (delay > 0)
{
player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds."));

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.telnethandlers.player;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
@@ -65,7 +66,7 @@ public class Ban implements ITelnetCommand
if (Util.isDigit(token))
{
time = Integer.parseInt(token) * 60 * 1000;
time += System.currentTimeMillis();
time += Chronos.currentTimeMillis();
}
if (args.length > 2)
{

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.telnethandlers.player;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
@@ -65,7 +66,7 @@ public class BanChat implements ITelnetCommand
if (Util.isDigit(token))
{
time = Integer.parseInt(token) * 60 * 1000;
time += System.currentTimeMillis();
time += Chronos.currentTimeMillis();
}
if (args.length > 2)
{

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.telnethandlers.player;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.instancemanager.PunishmentManager;
import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
@@ -65,7 +66,7 @@ public class Jail implements ITelnetCommand
if (Util.isDigit(token))
{
time = Integer.parseInt(token) * 60 * 1000;
time += System.currentTimeMillis();
time += Chronos.currentTimeMillis();
}
if (args.length > 2)
{

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.usercommandhandlers;
import java.text.SimpleDateFormat;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.handler.IUserCommandHandler;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -45,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler
final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
final StringBuilder htmlContent = new StringBuilder(500);
htmlContent.append("<html><body><center><table width=270 border=0 bgcolor=111111><tr><td width=170>Penalty</td><td width=100 align=center>Expiration Date</td></tr></table><table width=270 border=0><tr>");
if (player.getClanJoinExpiryTime() > System.currentTimeMillis())
if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis())
{
htmlContent.append("<td width=170>Unable to join a clan.</td><td width=100 align=center>");
htmlContent.append(format.format(player.getClanJoinExpiryTime()));
@@ -53,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler
penalty = true;
}
if (player.getClanCreateExpiryTime() > System.currentTimeMillis())
if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis())
{
htmlContent.append("<td width=170>Unable to create a clan.</td><td width=100 align=center>");
htmlContent.append(format.format(player.getClanCreateExpiryTime()));
@@ -61,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler
penalty = true;
}
if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis()))
if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()))
{
htmlContent.append("<td width=170>Unable to invite a clan member.</td><td width=100 align=center>");
htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime()));

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.usercommandhandlers;
import java.util.Map;
import java.util.Map.Entry;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.handler.IUserCommandHandler;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -65,7 +66,7 @@ public class InstanceZone implements IUserCommandHandler
{
for (Entry<Integer, Long> entry : instanceTimes.entrySet())
{
final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000;
final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000;
if (remainingTime > 60)
{
if (firstMessage)

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java vendored
View File

@@ -20,6 +20,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.GameTimeController;
import org.l2jmobius.gameserver.handler.IUserCommandHandler;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -74,7 +75,7 @@ public class Time implements IUserCommandHandler
player.sendPacket(sm);
if (Config.DISPLAY_SERVER_TIME)
{
player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis())));
player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis())));
}
return true;
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.voicedcommandhandlers;
import java.util.StringTokenizer;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
@@ -102,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler
return false;
}
PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName()));
PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName()));
if (expirationTime > 0)
{
BuilderUtil.sendSysMessage(activeChar, "Player " + player.getName() + " chat banned for " + expirationTime + " minutes.");

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.voicedcommandhandlers;
import java.text.SimpleDateFormat;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.handler.IVoicedCommandHandler;
import org.l2jmobius.gameserver.instancemanager.PremiumManager;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -74,7 +75,7 @@ public class Premium implements IVoicedCommandHandler
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + format.format(endDate) + "</font></td></tr>");
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + format.format(System.currentTimeMillis()) + "<br><br></font></td></tr>");
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + format.format(Chronos.currentTimeMillis()) + "<br><br></font></td></tr>");
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.List;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.InstanceReenterType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.actor.Summon;
@@ -129,7 +130,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
{
if (data.getTime() > 0)
{
time = System.currentTimeMillis() + data.getTime();
time = Chronos.currentTimeMillis() + data.getTime();
break;
}
@@ -139,7 +140,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
calendar.set(Calendar.MINUTE, data.getMinute());
calendar.set(Calendar.SECOND, 0);
if (calendar.getTimeInMillis() <= System.currentTimeMillis())
if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis())
{
calendar.add(Calendar.DAY_OF_MONTH, 1);
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -194,7 +195,7 @@ public class CastleDungeon extends AbstractInstance
return "36403-02.html";
}
if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), CASTLE_DUNGEON.get(npc.getId())))
if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), CASTLE_DUNGEON.get(npc.getId())))
{
return "36403-03.html";
}

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java vendored
View File

@@ -19,6 +19,7 @@ package instances.CavernOfThePirateCaptain;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
@@ -159,7 +160,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
{
world.setParameter("is83", world.getTemplateId() == TEMPLATE_ID_83);
world.setParameter("isNight", world.getTemplateId() == TEMPLATE_ID_60_NIGHT);
world.setParameter("storeTime", System.currentTimeMillis());
world.setParameter("storeTime", Chronos.currentTimeMillis());
final List<PlayerInstance> playersInside = new ArrayList<>();
if (!player.isInParty())
@@ -244,7 +245,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(groupMembers.getObjectId(), (is83 ? TEMPLATE_ID_83 : isNight ? TEMPLATE_ID_60_NIGHT : TEMPLATE_ID_60));
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
broadcastSystemMessage(player, groupMembers, SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, true);
return false;
@@ -381,7 +382,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance
{
if ((playersInside != null) && ((playersInside.getInstanceId() == world.getInstanceId()) && playersInside.isInsideRadius3D(npc, 1500)))
{
final long time = System.currentTimeMillis() - world.getParameters().getLong("storeTime", 0);
final long time = Chronos.currentTimeMillis() - world.getParameters().getLong("storeTime", 0);
if (time <= 300000) // 5 minutes
{
if (getRandomBoolean())

13
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java vendored
View File

@@ -22,6 +22,7 @@ import java.util.logging.Level;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -152,7 +153,7 @@ public abstract class Chamber extends AbstractInstance
{
final long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);
@@ -210,7 +211,7 @@ public abstract class Chamber extends AbstractInstance
}
// Teleport to raid room 10 min or lesser before instance end time for Tower and Square Chambers
else if (isBigChamber() && ((inst.getInstanceEndTime() - System.currentTimeMillis()) < 600000))
else if (isBigChamber() && ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) < 600000))
{
newRoom = ROOM_ENTER_POINTS.length - 1;
}
@@ -243,7 +244,7 @@ public abstract class Chamber extends AbstractInstance
// Do not schedule room change for Square and Tower Chambers, if raid room is reached
if (isBigChamber() && isBossRoom(world))
{
inst.setDuration((int) ((inst.getInstanceEndTime() - System.currentTimeMillis()) + 1200000)); // Add 20 min to instance time if raid room is reached
inst.setDuration((int) ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) + 1200000)); // Add 20 min to instance time if raid room is reached
for (Npc npc : inst.getNpcs())
{
@@ -500,7 +501,7 @@ public abstract class Chamber extends AbstractInstance
if (isBigChamber())
{
markRestriction(world); // Set reenter restriction
if ((inst.getInstanceEndTime() - System.currentTimeMillis()) > 300000)
if ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) > 300000)
{
inst.setDuration(300000); // Finish instance in 5 minutes
}
@@ -551,7 +552,7 @@ public abstract class Chamber extends AbstractInstance
final long nextInterval = bossRoom ? 60000 : (ROOM_CHANGE_INTERVAL + getRandom(ROOM_CHANGE_RANDOM_TIME)) * 1000;
// Schedule next room change only if remaining time is enough
if ((inst.getInstanceEndTime() - System.currentTimeMillis()) > nextInterval)
if ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) > nextInterval)
{
world.setParameter("roomChangeTask", ThreadPool.schedule(new ChangeRoomTask(world), nextInterval - 5000));
}
@@ -588,7 +589,7 @@ public abstract class Chamber extends AbstractInstance
public void run()
{
final Instance inst = InstanceManager.getInstance().getInstance(_world.getInstanceId());
if ((inst == null) || ((inst.getInstanceEndTime() - System.currentTimeMillis()) < 60000))
if ((inst == null) || ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) < 60000))
{
final ScheduledFuture<?> banishTask = _world.getParameters().getObject("banishTask", ScheduledFuture.class);
if (banishTask != null)

15
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -549,7 +550,7 @@ public class CrystalCaverns extends AbstractInstance
party.broadcastPacket(sm);
return false;
}
if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID))
if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);
@@ -971,9 +972,9 @@ public class CrystalCaverns extends AbstractInstance
if (tmpworld instanceof CCWorld)
{
final CCWorld world = (CCWorld) tmpworld;
if (((world._dragonClawStart + DRAGONCLAWTIME) <= System.currentTimeMillis()) || (world._dragonClawNeed <= 0))
if (((world._dragonClawStart + DRAGONCLAWTIME) <= Chronos.currentTimeMillis()) || (world._dragonClawNeed <= 0))
{
world._dragonClawStart = System.currentTimeMillis();
world._dragonClawStart = Chronos.currentTimeMillis();
world._dragonClawNeed = caster.getParty().getMemberCount() - 1;
}
else
@@ -1002,9 +1003,9 @@ public class CrystalCaverns extends AbstractInstance
{
return super.onSkillSee(npc, caster, skill, targets, isSummon);
}
else if (((world.dragonScaleStart + DRAGONSCALETIME) <= System.currentTimeMillis()) || (world.dragonScaleNeed <= 0))
else if (((world.dragonScaleStart + DRAGONSCALETIME) <= Chronos.currentTimeMillis()) || (world.dragonScaleNeed <= 0))
{
world.dragonScaleStart = System.currentTimeMillis();
world.dragonScaleStart = Chronos.currentTimeMillis();
world.dragonScaleNeed = ((party == null) && caster.isGM()) ? 0 : party != null ? (party.getMemberCount() - 1) : 100;
}
else
@@ -1765,7 +1766,7 @@ public class CrystalCaverns extends AbstractInstance
if (checkConditions(player))
{
final InstanceWorld instance = new CCWorld(System.currentTimeMillis() + 5400000);
final InstanceWorld instance = new CCWorld(Chronos.currentTimeMillis() + 5400000);
instance.setInstance(InstanceManager.getInstance().createDynamicInstance(TEMPLATE_ID));
InstanceManager.getInstance().addWorld(instance);
onEnterInstance(player, instance, true);
@@ -1942,7 +1943,7 @@ public class CrystalCaverns extends AbstractInstance
return null;
}
world.setStatus(30);
final long time = world.endTime - System.currentTimeMillis();
final long time = world.endTime - Chronos.currentTimeMillis();
final Instance baylorInstance = InstanceManager.getInstance().getInstance(world.getInstanceId());
baylorInstance.setDuration((int) time);

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java vendored
View File

@@ -30,6 +30,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.ai.CtrlIntention;
@@ -480,7 +481,7 @@ public class FinalEmperialTomb extends AbstractInstance implements IXmlReader
return false;
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID);
if (System.currentTimeMillis() < reentertime)
if (Chronos.currentTimeMillis() < reentertime)
{
party.broadcastPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addPcName(channelMember));
return false;

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java vendored
View File

@@ -23,6 +23,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -141,11 +142,11 @@ public class ScarletVanHalisha extends AbstractNpcAI
{
return SkillData.getInstance().getSkill(5015, 2);
}
else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < System.currentTimeMillis()) && (Rnd.get(100) < 10))
else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < Chronos.currentTimeMillis()) && (Rnd.get(100) < 10))
{
return SkillData.getInstance().getSkill(5019, 1);
}
else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < System.currentTimeMillis()) && (Rnd.get(100) < 10))
else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < Chronos.currentTimeMillis()) && (Rnd.get(100) < 10))
{
return SkillData.getInstance().getSkill(5018, 1);
}
@@ -249,7 +250,7 @@ public class ScarletVanHalisha extends AbstractNpcAI
case 5018:
case 5019:
{
_lastRangedSkillTime = System.currentTimeMillis();
_lastRangedSkillTime = Chronos.currentTimeMillis();
skillRange = 550;
break;
}

9
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.MountType;
@@ -310,7 +311,7 @@ public class IceQueensCastleBattle extends AbstractInstance
{
startQuestTimer("STAGE_2_FAILED", 360000, controller, null);
manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME);
controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000);
controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000);
}
break;
}
@@ -704,7 +705,7 @@ public class IceQueensCastleBattle extends AbstractInstance
}
case "SHOW_GLAKIAS_TIMER":
{
final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000);
final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000);
manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME);
break;
}
@@ -1285,14 +1286,14 @@ public class IceQueensCastleBattle extends AbstractInstance
party.broadcastPacket(sm);
return false;
}
else if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_EASY))
else if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_EASY))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(channelMember);
party.broadcastPacket(sm);
return false;
}
else if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_HARD))
else if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_HARD))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(channelMember);

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -25,6 +25,7 @@ import java.util.Map.Entry;
import java.util.function.Function;
import java.util.logging.Level;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
@@ -490,7 +491,7 @@ public class Kamaloka extends AbstractInstance
continue;
}
// if found instance still can't be reentered - exit
if (System.currentTimeMillis() < entry.getValue())
if (Chronos.currentTimeMillis() < entry.getValue())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00307_ControlDeviceOfTheGiants;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -101,7 +102,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
{
return "32711-09.html";
}
if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - System.currentTimeMillis()) > 0)
if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - Chronos.currentTimeMillis()) > 0)
{
return "32711-09a.html";
}
@@ -168,7 +169,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
qst.setCond(2, true);
}
}
GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(System.currentTimeMillis() + RESPAWN_DELAY));
GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(Chronos.currentTimeMillis() + RESPAWN_DELAY));
}
break;
}

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.SkillData;
@@ -101,13 +102,13 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest
}
GlobalVariablesManager.getInstance().set("VarangkaRespawn", respawnTime);
if ((respawnTime == 0) || ((respawnTime - System.currentTimeMillis()) < 0))
if ((respawnTime == 0) || ((respawnTime - Chronos.currentTimeMillis()) < 0))
{
startQuestTimer("altarSpawn", 5000, null, null);
}
else
{
startQuestTimer("altarSpawn", respawnTime - System.currentTimeMillis(), null, null);
startQuestTimer("altarSpawn", respawnTime - Chronos.currentTimeMillis(), null, null);
}
}
@@ -237,7 +238,7 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest
_varangkaMinion1 = null;
_varangkaMinion2 = null;
final long respawn = Rnd.get(14400000, 28800000);
GlobalVariablesManager.getInstance().set("VarangkaRespawn", System.currentTimeMillis() + respawn);
GlobalVariablesManager.getInstance().set("VarangkaRespawn", Chronos.currentTimeMillis() + respawn);
startQuestTimer("altarSpawn", respawn, null, null);
takeItems(member, PROTECTION_SOULS_PENDANT, 1);
return super.onKill(npc, killer, isSummon);

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -240,7 +241,7 @@ public class Q00511_AwlUnderFoot extends Quest
{
return "FortressWarden-02b.htm";
}
else if (isEnter && (dungeon.getReEnterTime() > System.currentTimeMillis()))
else if (isEnter && (dungeon.getReEnterTime() > Chronos.currentTimeMillis()))
{
return "FortressWarden-07.htm";
}
@@ -293,7 +294,7 @@ public class Q00511_AwlUnderFoot extends Quest
final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId());
world.setInstance(instance);
instance.setExitLoc(new Location(player));
dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME);
dungeon.setReEnterTime(Chronos.currentTimeMillis() + REENTERTIME);
InstanceManager.getInstance().addWorld(world);
final int instanceId = world.getInstanceId();
LOGGER.info("Fortress AwlUnderFoot started " + dungeon.getInstanceId() + " Instance: " + instanceId + " created by player: " + player.getName());

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java vendored
View File

@@ -17,6 +17,7 @@
package quests.Q00610_MagicalPowerOfWaterPart2;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -54,7 +55,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
registerQuestItems(GREEN_TOTEM, ASHUTAR_HEART);
final long test = GlobalVariablesManager.getInstance().getLong("Q00610_respawn", 0);
final long remain = test != 0 ? test - System.currentTimeMillis() : 0;
final long remain = test != 0 ? test - Chronos.currentTimeMillis() : 0;
if (remain > 0)
{
startQuestTimer("spawn_npc", remain, null, null);
@@ -158,7 +159,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
final int respawnMaxDelay = (int) (129600000 * Config.RAID_MAX_RESPAWN_MULTIPLIER);
final int respawnDelay = getRandom(respawnMinDelay, respawnMaxDelay);
cancelQuestTimer("despawn_ashutar", npc, null);
GlobalVariablesManager.getInstance().set("Q00610_respawn", String.valueOf(System.currentTimeMillis() + respawnDelay));
GlobalVariablesManager.getInstance().set("Q00610_respawn", String.valueOf(Chronos.currentTimeMillis() + respawnDelay));
startQuestTimer("spawn_npc", respawnDelay, null, null);
executeForEachPlayer(killer, npc, isSummon, true, false);
return super.onKill(npc, killer, isSummon);

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java vendored
View File

@@ -17,6 +17,7 @@
package quests.Q00616_MagicalPowerOfFirePart2;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -54,7 +55,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
registerQuestItems(RED_TOTEM, NASTRON_HEART);
final long test = GlobalVariablesManager.getInstance().getLong("Q00616_respawn", 0);
final long remain = test != 0 ? test - System.currentTimeMillis() : 0;
final long remain = test != 0 ? test - Chronos.currentTimeMillis() : 0;
if (remain > 0)
{
startQuestTimer("spawn_npc", remain, null, null);
@@ -158,7 +159,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
final int respawnMaxDelay = (int) (129600000 * Config.RAID_MAX_RESPAWN_MULTIPLIER);
final int respawnDelay = getRandom(respawnMinDelay, respawnMaxDelay);
cancelQuestTimer("despawn_nastron", npc, null);
GlobalVariablesManager.getInstance().set("Q00616_respawn", String.valueOf(System.currentTimeMillis() + respawnDelay));
GlobalVariablesManager.getInstance().set("Q00616_respawn", String.valueOf(Chronos.currentTimeMillis() + respawnDelay));
startQuestTimer("spawn_npc", respawnDelay, null, null);
executeForEachPlayer(killer, npc, isSummon, true, false);
return super.onKill(npc, killer, isSummon);

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
@@ -268,7 +269,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId());
world.setInstance(instance);
instance.setExitLoc(new Location(player));
dungeon.setReEnterTime(System.currentTimeMillis() + 14400000);
dungeon.setReEnterTime(Chronos.currentTimeMillis() + 14400000);
InstanceManager.getInstance().addWorld(world);
ThreadPool.schedule(new spawnNpcs((PAWORLD) world), 10000);
for (PlayerInstance partyMember : party.getMembers())
@@ -342,7 +343,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
{
return "FortWarden-08.htm";
}
else if (isEnter && (dungeon.getReEnterTime() > System.currentTimeMillis()))
else if (isEnter && (dungeon.getReEnterTime() > Chronos.currentTimeMillis()))
{
return "FortWarden-09.htm";
}

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.ChatType;
@@ -582,7 +583,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
}
}
if (dungeon.getReEnterTime() > System.currentTimeMillis())
if (dungeon.getReEnterTime() > Chronos.currentTimeMillis())
{
return "CastleWarden-18.html";
}
@@ -617,7 +618,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
world.setInstance(instance);
instance.setExitLoc(new Location(player));
final int instanceId = world.getInstanceId();
dungeon.setReEnterTime(System.currentTimeMillis() + REENTER_INTERVAL);
dungeon.setReEnterTime(Chronos.currentTimeMillis() + REENTER_INTERVAL);
InstanceManager.getInstance().addWorld(world);
ThreadPool.schedule(new spawnNpcs((CAUWorld) world), INITIAL_SPAWN_DELAY);
if (DEBUG)

80
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/Chronos.java Normal file
View File

@@ -0,0 +1,80 @@
/*
* Copyright (c) 2021 Pantelis Andrianakis
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.l2jmobius.commons.util;
/**
* Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.<br>
* To get the current time in milliseconds use Chronos.currentTimeMillis()
* @author Pantelis Andrianakis
* @version February 3rd 2021
*/
public class Chronos extends Thread
{
private long _currentTimeMillis = System.currentTimeMillis();
public Chronos()
{
super.setName("Chronos");
super.setPriority(MAX_PRIORITY);
super.setDaemon(true);
super.start();
}
@Override
public void run()
{
while (true)
{
_currentTimeMillis = System.currentTimeMillis();
// Sleep for approximately 1 millisecond.
try
{
Thread.sleep(1);
}
catch (Exception e)
{
}
}
}
/**
* Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.<br>
* <br>
* See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC).
* @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC.
*/
public static long currentTimeMillis()
{
return getInstance()._currentTimeMillis;
}
public static Chronos getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final Chronos INSTANCE = new Chronos();
}
}

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java
View File

@@ -32,6 +32,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.enums.ServerMode;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.DeadLockDetector;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.AugmentationData;
@@ -177,7 +178,7 @@ public class GameServer
public GameServer() throws Exception
{
final long serverLoadStart = System.currentTimeMillis();
final long serverLoadStart = Chronos.currentTimeMillis();
// GUI
if (!GraphicsEnvironment.isHeadless())
@@ -467,7 +468,7 @@ public class GameServer
final long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory.");
LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + ".");
LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds.");
ClientNetworkManager.getInstance().start();

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameTimeController.java
View File

@@ -23,6 +23,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -93,7 +94,7 @@ public class GameTimeController extends Thread
*/
public int getGameTicks()
{
return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK);
return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK);
}
/**
@@ -154,7 +155,7 @@ public class GameTimeController extends Thread
while (true)
{
nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100;
nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100;
try
{
@@ -165,7 +166,7 @@ public class GameTimeController extends Thread
LOGGER.log(Level.WARNING, getClass().getSimpleName(), e);
}
sleepTime = nextTickTime - System.currentTimeMillis();
sleepTime = nextTickTime - Chronos.currentTimeMillis();
if (sleepTime > 0)
{
try

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ItemsAutoDestroy.java
View File

@@ -22,6 +22,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.ItemLocation;
import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -42,7 +43,7 @@ public class ItemsAutoDestroy
public synchronized void addItem(ItemInstance item)
{
item.setDropTime(System.currentTimeMillis());
item.setDropTime(Chronos.currentTimeMillis());
_items.add(item);
}
@@ -53,7 +54,7 @@ public class ItemsAutoDestroy
return;
}
final long curtime = System.currentTimeMillis();
final long curtime = Chronos.currentTimeMillis();
final Iterator<ItemInstance> itemIterator = _items.iterator();
while (itemIterator.hasNext())
{

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java
View File

@@ -23,6 +23,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseBackup;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.BotReportTable;
import org.l2jmobius.gameserver.data.SchemeBufferTable;
import org.l2jmobius.gameserver.data.sql.ClanTable;
@@ -556,19 +557,19 @@ public class Shutdown extends Thread
protected void restartCounter()
{
_startTime = System.currentTimeMillis();
_startTime = Chronos.currentTimeMillis();
}
protected long getEstimatedTimeAndRestartCounter()
{
final long toReturn = System.currentTimeMillis() - _startTime;
final long toReturn = Chronos.currentTimeMillis() - _startTime;
restartCounter();
return toReturn;
}
protected long getEstimatedTime()
{
return System.currentTimeMillis() - _startTime;
return Chronos.currentTimeMillis() - _startTime;
}
}

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java vendored
View File

@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
/**
@@ -39,7 +40,7 @@ public class WarehouseCacheManager
public void addCacheTask(PlayerInstance pc)
{
CACHED_WH.put(pc, System.currentTimeMillis());
CACHED_WH.put(pc, Chronos.currentTimeMillis());
}
public void remCacheTask(PlayerInstance pc)
@@ -56,7 +57,7 @@ public class WarehouseCacheManager
@Override
public void run()
{
final long cTime = System.currentTimeMillis();
final long cTime = Chronos.currentTimeMillis();
for (Entry<PlayerInstance, Long> entry : CACHED_WH.entrySet())
{
if ((cTime - entry.getValue().longValue()) > CACHE_TIME)

13
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java
View File

@@ -39,6 +39,7 @@ import org.xml.sax.helpers.DefaultHandler;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -125,7 +126,7 @@ public class BotReportTable
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0]));
c.set(Calendar.MINUTE, Integer.parseInt(hour[1]));
if (System.currentTimeMillis() < c.getTimeInMillis())
if (Chronos.currentTimeMillis() < c.getTimeInMillis())
{
c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1);
}
@@ -292,7 +293,7 @@ public class BotReportTable
return false;
}
final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime());
final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime());
if (reuse < Config.BOTREPORT_REPORT_DELAY)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.FIVE_YEARS_HAVE_PASSED_SINCE_THIS_CHARACTER_S_CREATION);
@@ -303,7 +304,7 @@ public class BotReportTable
}
}
final long curTime = System.currentTimeMillis();
final long curTime = Chronos.currentTimeMillis();
if (rcd == null)
{
@@ -423,12 +424,12 @@ public class BotReportTable
c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0]));
c.set(Calendar.MINUTE, Integer.parseInt(hour[1]));
if (System.currentTimeMillis() > c.getTimeInMillis())
if (Chronos.currentTimeMillis() > c.getTimeInMillis())
{
c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1);
}
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis());
}
catch (Exception e)
{
@@ -470,7 +471,7 @@ public class BotReportTable
{
if (map.containsKey(objectId))
{
return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY;
return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY;
}
return true;
}

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
View File

@@ -31,6 +31,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager;
import org.l2jmobius.gameserver.instancemanager.CHSiegeManager;
import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager;
@@ -172,7 +173,7 @@ public class ClanTable
player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN);
return null;
}
if (System.currentTimeMillis() < player.getClanCreateExpiryTime())
if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime())
{
player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN);
return null;
@@ -361,7 +362,7 @@ public class ClanTable
{
destroyClan(clanId);
}
}, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000));
}, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000));
}
public boolean isAllyExists(String allyName)

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java
View File

@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.PrivateStoreType;
import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.TradeItem;
@@ -183,7 +184,7 @@ public class OfflineTraderTable
final Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(time);
cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS);
if (cal.getTimeInMillis() <= System.currentTimeMillis())
if (cal.getTimeInMillis() <= Chronos.currentTimeMillis())
{
continue;
}

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java
View File

@@ -23,6 +23,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.xml.AdminData;
import org.l2jmobius.gameserver.enums.PlayerAction;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -115,7 +116,7 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
// Admin Commands must run through a long running task, otherwise a command that takes too much time will freeze the server, this way you'll feel only a minor spike.
ThreadPool.execute(() ->
{
final long begin = System.currentTimeMillis();
final long begin = Chronos.currentTimeMillis();
try
{
if (Config.GMAUDIT)
@@ -133,7 +134,7 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
}
finally
{
final long runtime = System.currentTimeMillis() - begin;
final long runtime = Chronos.currentTimeMillis() - begin;
if (runtime < 5000)
{
return;

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java
View File

@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.GameClient;
@@ -48,7 +49,7 @@ public class AntiFeedManager
*/
public void setLastDeathTime(int objectId)
{
_lastDeathTimes.put(objectId, System.currentTimeMillis());
_lastDeathTimes.put(objectId, Chronos.currentTimeMillis());
}
/**
@@ -81,7 +82,7 @@ public class AntiFeedManager
return false;
}
if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL))
if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL))
{
return false;
}

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java
View File

@@ -39,6 +39,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.ManorMode;
@@ -272,7 +273,7 @@ public class CastleManorManager implements IXmlReader, IStorable
}
}
// Schedule mode change
ThreadPool.schedule(this::changeMode, _nextModeChange.getTimeInMillis() - System.currentTimeMillis());
ThreadPool.schedule(this::changeMode, _nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis());
}
public void changeMode()

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
View File

@@ -36,6 +36,7 @@ import org.w3c.dom.Node;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.CursedWeapon;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -337,7 +338,7 @@ public class CursedWeaponsManager
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING);
sm.addString(cw.getName());
// sm.addItemName(cw.getItemId());
sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000));
sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000));
player.sendPacket(sm);
}
}

11
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java
View File

@@ -29,6 +29,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
@@ -72,14 +73,14 @@ public class FishingChampionshipManager
refreshWinResult();
recalculateMinLength();
if (_enddate <= System.currentTimeMillis())
if (_enddate <= Chronos.currentTimeMillis())
{
_enddate = System.currentTimeMillis();
_enddate = Chronos.currentTimeMillis();
new finishChamp().run();
}
else
{
ThreadPool.schedule(new finishChamp(), _enddate - System.currentTimeMillis());
ThreadPool.schedule(new finishChamp(), _enddate - Chronos.currentTimeMillis());
}
}
@@ -206,7 +207,7 @@ public class FishingChampionshipManager
public long getTimeRemaining()
{
return (_enddate - System.currentTimeMillis()) / 60000;
return (_enddate - Chronos.currentTimeMillis()) / 60000;
}
public String getWinnerName(int par)
@@ -471,7 +472,7 @@ public class FishingChampionshipManager
shutdown();
LOGGER.info("FishingChampionshipManager : new event period start.");
ThreadPool.schedule(new finishChamp(), _enddate - System.currentTimeMillis());
ThreadPool.schedule(new finishChamp(), _enddate - Chronos.currentTimeMillis());
}
}

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/IdManager.java
View File

@@ -30,6 +30,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.util.PrimeFinder;
/**
@@ -100,7 +101,7 @@ public class IdManager
try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement())
{
final long cleanupStart = System.currentTimeMillis();
final long cleanupStart = Chronos.currentTimeMillis();
int cleanCount = 0;
// Characters
@@ -175,7 +176,7 @@ public class IdManager
statement.executeUpdate("UPDATE clanhall SET ownerId=0, paidUntil=0, paid=0 WHERE clanhall.ownerId NOT IN (SELECT clan_id FROM clan_data);");
statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);");
LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds.");
LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds.");
}
catch (Exception e)
{
@@ -191,7 +192,7 @@ public class IdManager
{
try (PreparedStatement statement = con.prepareStatement(line))
{
statement.setLong(1, System.currentTimeMillis());
statement.setLong(1, Chronos.currentTimeMillis());
cleanCount += statement.executeUpdate();
}
}

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java
View File

@@ -29,6 +29,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -175,7 +176,7 @@ public class InstanceManager implements IXmlReader
{
final int id = rs.getInt("instanceId");
final long time = rs.getLong("time");
if (time < System.currentTimeMillis())
if (time < Chronos.currentTimeMillis())
{
deleteInstanceTime(playerObjId, id);
}

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java
View File

@@ -29,6 +29,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.ItemsAutoDestroy;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -83,7 +84,7 @@ public class ItemsOnGroundManager implements Runnable
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(str))
{
ps.setLong(1, System.currentTimeMillis());
ps.setLong(1, Chronos.currentTimeMillis());
ps.execute();
}
catch (Exception e)

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java
View File

@@ -29,6 +29,7 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.Containers;
@@ -79,7 +80,7 @@ public class PremiumManager
final PlayerInstance player = event.getPlayer();
final String accountName = player.getAccountName();
loadPremiumData(accountName);
final long now = System.currentTimeMillis();
final long now = Chronos.currentTimeMillis();
final long premiumExpiration = getPremiumExpiration(accountName);
player.setPremiumStatus(premiumExpiration > now);
if (player.hasPremiumStatus())
@@ -153,7 +154,7 @@ public class PremiumManager
public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit)
{
final long addTime = timeUnit.toMillis(timeValue);
final long now = System.currentTimeMillis();
final long now = Chronos.currentTimeMillis();
// new premium task at least from now
final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName));
final long newPremiumExpiration = oldPremiumExpiration + addTime;

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java
View File

@@ -25,6 +25,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.holders.PunishmentHolder;
import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
import org.l2jmobius.gameserver.model.punishment.PunishmentTask;
@@ -69,7 +70,7 @@ public class PunishmentManager
final long expirationTime = rset.getLong("expiration");
if ((type != null) && (affect != null))
{
if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task.
if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task.
{
expired++;
}

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoDManager.java
View File

@@ -21,6 +21,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask;
import org.l2jmobius.gameserver.model.quest.Quest;
@@ -105,7 +106,7 @@ public class SoDManager
case 2:
{
// Conquest Complete state, if too much time is passed than change to defense state
final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis();
final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis();
if (timePast >= Config.SOD_STAGE_2_LENGTH)
{
// change to Attack state because Defend statet is not implemented
@@ -173,7 +174,7 @@ public class SoDManager
public void setSoDState(int value, boolean doSave)
{
LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + ".");
_SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis());
_SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis());
_SoDState = value;
// reset number of Tiat kills
if (_SoDState == 1)
@@ -199,7 +200,7 @@ public class SoDManager
}
case 2:
{
return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis());
return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis());
}
case 3:
{

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoIManager.java
View File

@@ -20,6 +20,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.DoorData;
import org.l2jmobius.gameserver.model.Location;
@@ -75,7 +76,7 @@ public class SoIManager
{
return 0;
}
return (GlobalVariablesManager.getInstance().getLong("SoI_opened", 0) * 1000) - System.currentTimeMillis();
return (GlobalVariablesManager.getInstance().getLong("SoI_opened", 0) * 1000) - Chronos.currentTimeMillis();
}
public static void setCurrentStage(int stage)
@@ -111,7 +112,7 @@ public class SoIManager
{
return;
}
GlobalVariablesManager.getInstance().set("SoI_opened", (System.currentTimeMillis() + time) / 1000);
GlobalVariablesManager.getInstance().set("SoI_opened", (Chronos.currentTimeMillis() + time) / 1000);
LOGGER.info("Seed of Infinity Manager: Opening the seed for " + Util.formatTime((int) time / 1000));
spawnOpenedSeed();
DoorData.getInstance().getDoor(14240102).openMe();

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java
View File

@@ -36,6 +36,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.PropertiesParser;
import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.xml.SkillData;
@@ -1113,7 +1114,7 @@ public class TerritoryWarManager implements Siegable
{
final Calendar cal = Calendar.getInstance();
final long nextSiegeDate = GlobalVariablesManager.getInstance().getLong(GLOBAL_VARIABLE, 0);
if (nextSiegeDate > System.currentTimeMillis())
if (nextSiegeDate > Chronos.currentTimeMillis())
{
cal.setTimeInMillis(nextSiegeDate);
}
@@ -1122,7 +1123,7 @@ public class TerritoryWarManager implements Siegable
// Let's check if territory war date was in the past.
if (cal.before(Calendar.getInstance()))
{
cal.setTimeInMillis(System.currentTimeMillis());
cal.setTimeInMillis(Chronos.currentTimeMillis());
}
final boolean hasOwnedCastle = CastleManager.getInstance().hasOwnedCastle();

9
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/events/TvTManager.java
View File

@@ -22,6 +22,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.util.Broadcast;
/**
@@ -120,7 +121,7 @@ public class TvTManager
Broadcast.toAllOnlinePlayers("TvT Event: Registration opened for " + Config.TVT_EVENT_PARTICIPATION_TIME + " minute(s).");
// schedule registration end
_task.setStartTime(System.currentTimeMillis() + (60000 * Config.TVT_EVENT_PARTICIPATION_TIME));
_task.setStartTime(Chronos.currentTimeMillis() + (60000 * Config.TVT_EVENT_PARTICIPATION_TIME));
ThreadPool.execute(_task);
}
}
@@ -139,7 +140,7 @@ public class TvTManager
else
{
TvTEvent.sysMsgToAllParticipants("TvT Event: Teleporting participants to an arena in " + Config.TVT_EVENT_START_LEAVE_TELEPORT_DELAY + " second(s).");
_task.setStartTime(System.currentTimeMillis() + (60000 * Config.TVT_EVENT_RUNNING_TIME));
_task.setStartTime(Chronos.currentTimeMillis() + (60000 * Config.TVT_EVENT_RUNNING_TIME));
ThreadPool.execute(_task);
}
}
@@ -160,7 +161,7 @@ public class TvTManager
{
if (_task.nextRun.cancel(false))
{
_task.setStartTime(System.currentTimeMillis());
_task.setStartTime(Chronos.currentTimeMillis());
ThreadPool.execute(_task);
}
}
@@ -186,7 +187,7 @@ public class TvTManager
@Override
public void run()
{
final int delay = (int) Math.round((_startTime - System.currentTimeMillis()) / 1000.0);
final int delay = (int) Math.round((_startTime - Chronos.currentTimeMillis()) / 1000.0);
if (delay > 0)
{
announce(delay);

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java
View File

@@ -25,6 +25,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.SpawnTable;
import org.l2jmobius.gameserver.data.xml.SkillData;
@@ -421,7 +422,7 @@ public class BlockChecker
// Start up player parameters
setUpPlayers();
// Set the started time
_startedTime = System.currentTimeMillis() + 300000;
_startedTime = Chronos.currentTimeMillis() + 300000;
}
}
@@ -518,7 +519,7 @@ public class BlockChecker
_redPoints += _numOfBoxes / 2;
_bluePoints += _numOfBoxes / 2;
_holder.broadCastPacketToTeam(new ExCubeGameChangePoints((int) ((_startedTime - System.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints()));
_holder.broadCastPacketToTeam(new ExCubeGameChangePoints((int) ((_startedTime - Chronos.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints()));
}
}

17
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
View File

@@ -28,6 +28,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -60,7 +61,7 @@ public class Lottery
_prize = Config.ALT_LOTTERY_PRIZE;
_isSellingTickets = false;
_isStarted = false;
_enddate = System.currentTimeMillis();
_enddate = Chronos.currentTimeMillis();
if (Config.ALLOW_LOTTERY)
{
(new startLottery()).run();
@@ -140,20 +141,20 @@ public class Lottery
{
_prize = rset.getLong("prize");
_enddate = rset.getLong("enddate");
if (_enddate <= (System.currentTimeMillis() + (2 * MINUTE)))
if (_enddate <= (Chronos.currentTimeMillis() + (2 * MINUTE)))
{
(new finishLottery()).run();
return;
}
if (_enddate > System.currentTimeMillis())
if (_enddate > Chronos.currentTimeMillis())
{
_isStarted = true;
ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
if (_enddate > (System.currentTimeMillis() + (12 * MINUTE)))
ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis());
if (_enddate > (Chronos.currentTimeMillis() + (12 * MINUTE)))
{
_isSellingTickets = true;
ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE));
}
return;
}
@@ -185,8 +186,8 @@ public class Lottery
_enddate = finishtime.getTimeInMillis();
}
ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis());
ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE));
ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis());
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY))

9
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java
View File

@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.data.xml.TransformData;
@@ -237,7 +238,7 @@ public class CursedWeapon implements INamable
@Override
public void run()
{
if (System.currentTimeMillis() >= _endTime)
if (Chronos.currentTimeMillis() >= _endTime)
{
endOfLife();
}
@@ -370,7 +371,7 @@ public class CursedWeapon implements INamable
public void reActivate()
{
_isActivated = true;
if ((_endTime - System.currentTimeMillis()) <= 0)
if ((_endTime - Chronos.currentTimeMillis()) <= 0)
{
endOfLife();
}
@@ -388,7 +389,7 @@ public class CursedWeapon implements INamable
dropIt(attackable, player);
// Start the Life Task
_endTime = System.currentTimeMillis() + (_duration * 60000);
_endTime = Chronos.currentTimeMillis() + (_duration * 60000);
_removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000);
return true;
}
@@ -683,7 +684,7 @@ public class CursedWeapon implements INamable
public long getTimeLeft()
{
return _endTime - System.currentTimeMillis();
return _endTime - Chronos.currentTimeMillis();
}
public void goTo(PlayerInstance player)

7
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Message.java
View File

@@ -23,6 +23,7 @@ import java.sql.SQLException;
import java.util.concurrent.ScheduledFuture;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.sql.CharNameTable;
import org.l2jmobius.gameserver.instancemanager.IdManager;
@@ -100,7 +101,7 @@ public class Message
_receiverId = receiverId;
_subject = subject;
_content = text;
_expiration = isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000);
_expiration = isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000);
_hasAttachments = false;
_unread = true;
_deletedBySender = false;
@@ -118,7 +119,7 @@ public class Message
_receiverId = receiverId;
_subject = subject;
_content = content;
_expiration = System.currentTimeMillis() + (EXPIRATION * 3600000);
_expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000);
_reqAdena = 0;
_hasAttachments = false;
_unread = true;
@@ -138,7 +139,7 @@ public class Message
_receiverId = msg.getSenderId();
_subject = "";
_content = "";
_expiration = System.currentTimeMillis() + (EXPIRATION * 3600000);
_expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000);
_unread = true;
_deletedBySender = true;
_deletedByReceiver = false;

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Nevit.java
View File

@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
@@ -66,7 +67,7 @@ public class Nevit implements IUniqueId
cal.set(Calendar.MILLISECOND, 0);
// Reset Nevit's Blessing
if ((_player.getLastAccess() < (cal.getTimeInMillis() / 1000)) && (System.currentTimeMillis() > cal.getTimeInMillis()))
if ((_player.getLastAccess() < (cal.getTimeInMillis() / 1000)) && (Chronos.currentTimeMillis() > cal.getTimeInMillis()))
{
_player.getVariables().set("hunting_time", 0);
}

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Petition.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model;
import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.PetitionState;
import org.l2jmobius.gameserver.enums.PetitionType;
import org.l2jmobius.gameserver.instancemanager.IdManager;
@@ -36,7 +37,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public class Petition
{
private final long _submitTime = System.currentTimeMillis();
private final long _submitTime = Chronos.currentTimeMillis();
private final int _id;
private final PetitionType _type;
private PetitionState _state = PetitionState.PENDING;

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java
View File

@@ -25,6 +25,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.NpcPersonalAIData;
import org.l2jmobius.gameserver.data.xml.NpcData;
@@ -252,7 +253,7 @@ public class Spawn extends Location implements IIdentifiable, INamable
_scheduledCount++;
// Schedule the next respawn.
RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay));
RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay));
}
}

9
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TimeStamp.java
View File

@@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.model;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
@@ -49,7 +50,7 @@ public class TimeStamp
_id1 = skill.getId();
_id2 = skill.getLevel();
_reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0;
_group = -1;
}
@@ -64,7 +65,7 @@ public class TimeStamp
_id1 = item.getId();
_id2 = item.getObjectId();
_reuse = reuse;
_stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0;
_stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0;
_group = item.getSharedReuseGroup();
}
@@ -142,7 +143,7 @@ public class TimeStamp
{
return 0;
}
final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0);
final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0);
if (remainingTime == 0)
{
_stamp = 0;
@@ -160,7 +161,7 @@ public class TimeStamp
{
return false;
}
final boolean hasNotPassed = System.currentTimeMillis() < _stamp;
final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp;
if (!hasNotPassed)
{
_stamp = 0;

3
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.InstanceType;
import org.l2jmobius.gameserver.enums.ShotType;
import org.l2jmobius.gameserver.handler.ActionHandler;
@@ -737,7 +738,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
*/
private final void sendInstanceUpdate(Instance instance, boolean hide)
{
final int startTime = (int) ((System.currentTimeMillis() - instance.getInstanceStartTime()) / 1000);
final int startTime = (int) ((Chronos.currentTimeMillis() - instance.getInstanceStartTime()) / 1000);
final int endTime = (int) ((instance.getInstanceEndTime() - instance.getInstanceStartTime()) / 1000);
if (instance.isTimerIncrease())
{

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -27,6 +27,7 @@ import java.util.logging.Level;
import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.AttackableAI;
import org.l2jmobius.gameserver.ai.CreatureAI;
@@ -244,7 +245,7 @@ public class Attackable extends Npc
if (_firstCommandChannelAttacked != null)
{
_commandChannelTimer = new CommandChannelTimer(this);
_commandChannelLastAttack = System.currentTimeMillis();
_commandChannelLastAttack = Chronos.currentTimeMillis();
ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack
_firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg
}
@@ -253,7 +254,7 @@ public class Attackable extends Npc
}
else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel
{
_commandChannelLastAttack = System.currentTimeMillis(); // update last attack time
_commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time
}
}

Some files were not shown because too many files have changed in this diff Show More