| Penalty | Expiration Date |
| Unable to join a clan. | "); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +55,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) { htmlContent.append(" | Unable to create a clan. | "); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +63,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(" | Unable to invite a clan member. | "); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 530047a4f2..57bd48cd81 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -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; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index a2eab150c7..f727b3518f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -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; @@ -103,7 +104,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."); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 213e03e20a..5bf36c47d0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -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(" |
| Spoil Chance: x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " | |||||
| Spoil Amount: x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " | |||||
| Expires: " + format.format(endDate) + " | |||||
| Current Date: " + format.format(System.currentTimeMillis()) + " | |||||
| Current Date: " + format.format(Chronos.currentTimeMillis()) + " | |||||
| 1. Premium accounts CAN NOT BE TRANSFERED. | |||||
| 2. Premium does not effect party members. | "); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); sb.append(" | "); sb.append(auction.getHighestBid()); sb.append(" | "); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index f469c39159..2362aa9446 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; @@ -73,7 +74,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -126,7 +127,7 @@ public class ProvisionalHalls extends AbstractNpcAI for (int id : CLAN_HALLS.keySet()) { - if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < Chronos.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -137,7 +138,7 @@ public class ProvisionalHalls extends AbstractNpcAI clanHall.setOwner(player.getClan()); } player.sendMessage("Congratulations! You now own a provisional clan hall!"); - startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -177,7 +178,7 @@ public class ProvisionalHalls extends AbstractNpcAI else if (event.startsWith(HALL_RESET_VAR)) { final String id = event.replace(HALL_RESET_VAR, ""); - if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= Chronos.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 18f813b1a2..a3c74220a9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,6 +19,7 @@ package ai.others.TrainingCamp; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -111,7 +112,7 @@ public class TrainingCamp extends AbstractNpcAI player.teleToLocation(TRAINING_LOCATION); player.setImmobilized(true); // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. - player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), Chronos.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); @@ -203,7 +204,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(System.currentTimeMillis()); + holder.setEndTime(Chronos.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 49dfa6b963..6140daa716 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -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) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index cce5b52533..d97b3c74db 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -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; @@ -94,9 +95,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); @@ -110,7 +111,7 @@ public class GiftOfVitality extends LongTimeEvent { SkillCaster.triggerCast(player, player, GIFT_OF_VITALITY.getSkill()); SkillCaster.triggerCast(player, player, 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; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 038d7883b0..7fb3b481dd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -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 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 0898d8dbc5..088b261fbe 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -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 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 4f95514f8c..b6900127dc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -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)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 64d4112e1f..729838d853 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -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(); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 9801093a20..0e4285c8e3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -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.GraciaSeedsManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -66,7 +67,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index e2c17e3d50..dec3cec950 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -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; @@ -118,7 +119,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5fffc77ae3..8c3faede2d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,6 +24,7 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -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); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index aa1d6dd435..ae1bb4e0b2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -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); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index ff3b82a10f..21489c89f6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -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(); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index a81161c50a..adb3c27701 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,6 +16,7 @@ */ package handlers.dailymissionhandlers; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -61,9 +62,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(System.currentTimeMillis()); + entry.setLastCompleted(Chronos.currentTimeMillis()); } - else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index 9fee9dd50e..0322107487 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,6 +18,7 @@ package handlers.dailymissionhandlers; import java.util.Calendar; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -63,7 +64,7 @@ public class LoginWeekendDailyMissionHandler extends AbstractDailyMissionHandler final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK); final long lastCompleted = entry.getLastCompleted(); if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY)) // Reward only on weekend. - && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 71928b144a..c2ea6f7a5a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -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.")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 245af11bfa..2abbe8e8e8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -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; @@ -180,7 +181,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.")); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index 3dd1cdc97d..fd92c92ed9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -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) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index f653561c0d..85b92a163b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -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) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index cf3736fc0e..c21718ad0c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -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) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 43b6df41dc..a57194664d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -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; @@ -46,7 +47,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
| Penalty | Expiration Date |
| Unable to join a clan. | "); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +55,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) { htmlContent.append(" | Unable to create a clan. | "); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +63,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(" | Unable to invite a clan member. | "); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 530047a4f2..57bd48cd81 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -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; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index a2eab150c7..f727b3518f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -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; @@ -103,7 +104,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."); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 213e03e20a..5bf36c47d0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -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(" |
| Spoil Chance: x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " | |||||
| Spoil Amount: x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " | |||||
| Expires: " + format.format(endDate) + " | |||||
| Current Date: " + format.format(System.currentTimeMillis()) + " | |||||
| Current Date: " + format.format(Chronos.currentTimeMillis()) + " | |||||
| 1. Premium accounts CAN NOT BE TRANSFERED. | |||||
| 2. Premium does not effect party members. | "); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); sb.append(" | "); sb.append(auction.getHighestBid()); sb.append(" | "); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index f469c39159..2362aa9446 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; @@ -73,7 +74,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -126,7 +127,7 @@ public class ProvisionalHalls extends AbstractNpcAI for (int id : CLAN_HALLS.keySet()) { - if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < Chronos.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -137,7 +138,7 @@ public class ProvisionalHalls extends AbstractNpcAI clanHall.setOwner(player.getClan()); } player.sendMessage("Congratulations! You now own a provisional clan hall!"); - startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -177,7 +178,7 @@ public class ProvisionalHalls extends AbstractNpcAI else if (event.startsWith(HALL_RESET_VAR)) { final String id = event.replace(HALL_RESET_VAR, ""); - if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= Chronos.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 18f813b1a2..a3c74220a9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,6 +19,7 @@ package ai.others.TrainingCamp; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -111,7 +112,7 @@ public class TrainingCamp extends AbstractNpcAI player.teleToLocation(TRAINING_LOCATION); player.setImmobilized(true); // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. - player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), Chronos.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); @@ -203,7 +204,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(System.currentTimeMillis()); + holder.setEndTime(Chronos.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 49dfa6b963..6140daa716 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -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) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index cce5b52533..d97b3c74db 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -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; @@ -94,9 +95,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); @@ -110,7 +111,7 @@ public class GiftOfVitality extends LongTimeEvent { SkillCaster.triggerCast(player, player, GIFT_OF_VITALITY.getSkill()); SkillCaster.triggerCast(player, player, 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; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 038d7883b0..7fb3b481dd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -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 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 0898d8dbc5..088b261fbe 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -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 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 4f95514f8c..b6900127dc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -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)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 64d4112e1f..729838d853 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -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(); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 9801093a20..0e4285c8e3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -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.GraciaSeedsManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -66,7 +67,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index e2c17e3d50..dec3cec950 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -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; @@ -118,7 +119,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5fffc77ae3..8c3faede2d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,6 +24,7 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -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); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index aa1d6dd435..ae1bb4e0b2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -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); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index ff3b82a10f..21489c89f6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -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(); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index a81161c50a..adb3c27701 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,6 +16,7 @@ */ package handlers.dailymissionhandlers; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -61,9 +62,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(System.currentTimeMillis()); + entry.setLastCompleted(Chronos.currentTimeMillis()); } - else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index 9fee9dd50e..0322107487 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,6 +18,7 @@ package handlers.dailymissionhandlers; import java.util.Calendar; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -63,7 +64,7 @@ public class LoginWeekendDailyMissionHandler extends AbstractDailyMissionHandler final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK); final long lastCompleted = entry.getLastCompleted(); if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY)) // Reward only on weekend. - && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 71928b144a..c2ea6f7a5a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -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.")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 245af11bfa..2abbe8e8e8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -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; @@ -180,7 +181,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.")); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index 3dd1cdc97d..fd92c92ed9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -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) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index f653561c0d..85b92a163b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -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) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index cf3736fc0e..c21718ad0c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -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) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 43b6df41dc..a57194664d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -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; @@ -46,7 +47,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
| Penalty | Expiration Date |
| Unable to join a clan. | "); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +55,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) { htmlContent.append(" | Unable to create a clan. | "); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +63,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(" | Unable to invite a clan member. | "); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 530047a4f2..57bd48cd81 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -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; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index a2eab150c7..f727b3518f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -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; @@ -103,7 +104,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."); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 213e03e20a..5bf36c47d0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -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(" |
| Spoil Chance: x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " | |||||
| Spoil Amount: x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " | |||||
| Expires: " + format.format(endDate) + " | |||||
| Current Date: " + format.format(System.currentTimeMillis()) + " | |||||
| Current Date: " + format.format(Chronos.currentTimeMillis()) + " | |||||
| 1. Premium accounts CAN NOT BE TRANSFERED. | |||||
| 2. Premium does not effect party members. | "); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); sb.append(" | "); sb.append(auction.getHighestBid()); sb.append(" | "); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index f469c39159..2362aa9446 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; @@ -73,7 +74,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -126,7 +127,7 @@ public class ProvisionalHalls extends AbstractNpcAI for (int id : CLAN_HALLS.keySet()) { - if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < Chronos.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -137,7 +138,7 @@ public class ProvisionalHalls extends AbstractNpcAI clanHall.setOwner(player.getClan()); } player.sendMessage("Congratulations! You now own a provisional clan hall!"); - startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -177,7 +178,7 @@ public class ProvisionalHalls extends AbstractNpcAI else if (event.startsWith(HALL_RESET_VAR)) { final String id = event.replace(HALL_RESET_VAR, ""); - if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= Chronos.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 18f813b1a2..a3c74220a9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,6 +19,7 @@ package ai.others.TrainingCamp; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -111,7 +112,7 @@ public class TrainingCamp extends AbstractNpcAI player.teleToLocation(TRAINING_LOCATION); player.setImmobilized(true); // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. - player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), Chronos.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); @@ -203,7 +204,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(System.currentTimeMillis()); + holder.setEndTime(Chronos.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 49dfa6b963..6140daa716 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -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) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index cce5b52533..d97b3c74db 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -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; @@ -94,9 +95,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); @@ -110,7 +111,7 @@ public class GiftOfVitality extends LongTimeEvent { SkillCaster.triggerCast(player, player, GIFT_OF_VITALITY.getSkill()); SkillCaster.triggerCast(player, player, 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; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java index b86300b754..652c30bac5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,6 +16,7 @@ */ package events.HappyHours; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +40,7 @@ public class HappyHours extends LongTimeEvent // Other private static final int MIN_LEVEL = 20; private static final int REWARD_INTERVAL = 60 * 60 * 1000; // 1 hour - private static long _lastRewardTime = System.currentTimeMillis(); + private static long _lastRewardTime = Chronos.currentTimeMillis(); private HappyHours() { @@ -76,9 +77,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = System.currentTimeMillis(); + _lastRewardTime = Chronos.currentTimeMillis(); final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true); final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_OBTAINED_S1_SIBIS_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 038d7883b0..7fb3b481dd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -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 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 0898d8dbc5..088b261fbe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -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 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 4f95514f8c..b6900127dc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -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)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 64d4112e1f..729838d853 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -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(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 9801093a20..0e4285c8e3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -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.GraciaSeedsManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -66,7 +67,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index e2c17e3d50..dec3cec950 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -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; @@ -118,7 +119,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5fffc77ae3..8c3faede2d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,6 +24,7 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -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); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index aa1d6dd435..ae1bb4e0b2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -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); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index ff3b82a10f..21489c89f6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -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(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index a81161c50a..adb3c27701 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,6 +16,7 @@ */ package handlers.dailymissionhandlers; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -61,9 +62,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(System.currentTimeMillis()); + entry.setLastCompleted(Chronos.currentTimeMillis()); } - else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index 9fee9dd50e..0322107487 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,6 +18,7 @@ package handlers.dailymissionhandlers; import java.util.Calendar; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -63,7 +64,7 @@ public class LoginWeekendDailyMissionHandler extends AbstractDailyMissionHandler final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK); final long lastCompleted = entry.getLastCompleted(); if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY)) // Reward only on weekend. - && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 71928b144a..c2ea6f7a5a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -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.")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 245af11bfa..2abbe8e8e8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -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; @@ -180,7 +181,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.")); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index 3dd1cdc97d..fd92c92ed9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -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) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index f653561c0d..85b92a163b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -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) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index cf3736fc0e..c21718ad0c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -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) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 43b6df41dc..a57194664d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -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; @@ -46,7 +47,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
| Penalty | Expiration Date |
| Unable to join a clan. | "); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +55,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) { htmlContent.append(" | Unable to create a clan. | "); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +63,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(" | Unable to invite a clan member. | "); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 530047a4f2..57bd48cd81 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -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; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index a2eab150c7..f727b3518f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -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; @@ -103,7 +104,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."); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 213e03e20a..5bf36c47d0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -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(" |
| Spoil Chance: x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " | |||||
| Spoil Amount: x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " | |||||
| Expires: " + format.format(endDate) + " | |||||
| Current Date: " + format.format(System.currentTimeMillis()) + " | |||||
| Current Date: " + format.format(Chronos.currentTimeMillis()) + " | |||||
| 1. Premium accounts CAN NOT BE TRANSFERED. | |||||
| 2. Premium does not effect party members. | "); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); sb.append(" | "); sb.append(auction.getHighestBid()); sb.append(" | "); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index f469c39159..2362aa9446 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; @@ -73,7 +74,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -126,7 +127,7 @@ public class ProvisionalHalls extends AbstractNpcAI for (int id : CLAN_HALLS.keySet()) { - if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < Chronos.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -137,7 +138,7 @@ public class ProvisionalHalls extends AbstractNpcAI clanHall.setOwner(player.getClan()); } player.sendMessage("Congratulations! You now own a provisional clan hall!"); - startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -177,7 +178,7 @@ public class ProvisionalHalls extends AbstractNpcAI else if (event.startsWith(HALL_RESET_VAR)) { final String id = event.replace(HALL_RESET_VAR, ""); - if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= Chronos.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 6075e499f2..dfcb4a657c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,6 +19,7 @@ package ai.others.TrainingCamp; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -111,7 +112,7 @@ public class TrainingCamp extends AbstractNpcAI player.teleToLocation(TRAINING_LOCATION); player.setImmobilized(true); // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. - player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), Chronos.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); @@ -203,7 +204,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(System.currentTimeMillis()); + holder.setEndTime(Chronos.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 266a3ce5d7..0bdd1866e5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -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) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 81a3c0008a..e44992df15 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -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; @@ -94,9 +95,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_HR_S3_MIN); @@ -110,7 +111,7 @@ public class GiftOfVitality extends LongTimeEvent { SkillCaster.triggerCast(player, player, GIFT_OF_VITALITY.getSkill()); SkillCaster.triggerCast(player, player, 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; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java index 536ed53fe2..2d3261f1c3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,6 +16,7 @@ */ package events.HappyHours; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +40,7 @@ public class HappyHours extends LongTimeEvent // Other private static final int MIN_LEVEL = 20; private static final int REWARD_INTERVAL = 60 * 60 * 1000; // 1 hour - private static long _lastRewardTime = System.currentTimeMillis(); + private static long _lastRewardTime = Chronos.currentTimeMillis(); private HappyHours() { @@ -76,9 +77,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = System.currentTimeMillis(); + _lastRewardTime = Chronos.currentTimeMillis(); final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true); final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 9c977cbe43..2e66ed664e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -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_HR_S3_MIN); @@ -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 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 241482d1cb..3e5d9a15d5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -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 diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 4f95514f8c..b6900127dc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -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)) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 64d4112e1f..729838d853 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -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(); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 9801093a20..0e4285c8e3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -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.GraciaSeedsManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -66,7 +67,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index e2c17e3d50..dec3cec950 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -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; @@ -118,7 +119,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5fffc77ae3..8c3faede2d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,6 +24,7 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index aa1d6dd435..ae1bb4e0b2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index ff3b82a10f..21489c89f6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -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(); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index a81161c50a..adb3c27701 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,6 +16,7 @@ */ package handlers.dailymissionhandlers; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -61,9 +62,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(System.currentTimeMillis()); + entry.setLastCompleted(Chronos.currentTimeMillis()); } - else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index 9fee9dd50e..0322107487 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,6 +18,7 @@ package handlers.dailymissionhandlers; import java.util.Calendar; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -63,7 +64,7 @@ public class LoginWeekendDailyMissionHandler extends AbstractDailyMissionHandler final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK); final long lastCompleted = entry.getLastCompleted(); if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY)) // Reward only on weekend. - && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 71928b144a..c2ea6f7a5a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -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.")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 245af11bfa..2abbe8e8e8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -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; @@ -180,7 +181,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.")); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index 3dd1cdc97d..fd92c92ed9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -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) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index f653561c0d..85b92a163b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -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) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index cf3736fc0e..c21718ad0c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -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) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 43b6df41dc..a57194664d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -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; @@ -46,7 +47,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
| Penalty | Expiration Date |
| Unable to join a clan. | "); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +55,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) { htmlContent.append(" | Unable to create a clan. | "); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +63,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(" | Unable to invite a clan member. | "); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 530047a4f2..57bd48cd81 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -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; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index a2eab150c7..f727b3518f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -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; @@ -103,7 +104,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."); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 213e03e20a..5bf36c47d0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -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(" |
| Spoil Chance: x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " | |||||
| Spoil Amount: x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " | |||||
| Expires: " + format.format(endDate) + " | |||||
| Current Date: " + format.format(System.currentTimeMillis()) + " | |||||
| Current Date: " + format.format(Chronos.currentTimeMillis()) + " | |||||
| 1. Premium accounts CAN NOT BE TRANSFERED. | |||||
| 2. Premium does not effect party members. | "); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); sb.append(" | "); sb.append(auction.getHighestBid()); sb.append(" | "); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index f469c39159..2362aa9446 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; @@ -73,7 +74,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -126,7 +127,7 @@ public class ProvisionalHalls extends AbstractNpcAI for (int id : CLAN_HALLS.keySet()) { - if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < Chronos.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -137,7 +138,7 @@ public class ProvisionalHalls extends AbstractNpcAI clanHall.setOwner(player.getClan()); } player.sendMessage("Congratulations! You now own a provisional clan hall!"); - startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -177,7 +178,7 @@ public class ProvisionalHalls extends AbstractNpcAI else if (event.startsWith(HALL_RESET_VAR)) { final String id = event.replace(HALL_RESET_VAR, ""); - if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= Chronos.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 18f813b1a2..a3c74220a9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,6 +19,7 @@ package ai.others.TrainingCamp; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -111,7 +112,7 @@ public class TrainingCamp extends AbstractNpcAI player.teleToLocation(TRAINING_LOCATION); player.setImmobilized(true); // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. - player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), Chronos.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); @@ -203,7 +204,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(System.currentTimeMillis()); + holder.setEndTime(Chronos.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 49dfa6b963..6140daa716 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -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) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index cce5b52533..d97b3c74db 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -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; @@ -94,9 +95,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); @@ -110,7 +111,7 @@ public class GiftOfVitality extends LongTimeEvent { SkillCaster.triggerCast(player, player, GIFT_OF_VITALITY.getSkill()); SkillCaster.triggerCast(player, player, 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; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java index 536ed53fe2..2d3261f1c3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,6 +16,7 @@ */ package events.HappyHours; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +40,7 @@ public class HappyHours extends LongTimeEvent // Other private static final int MIN_LEVEL = 20; private static final int REWARD_INTERVAL = 60 * 60 * 1000; // 1 hour - private static long _lastRewardTime = System.currentTimeMillis(); + private static long _lastRewardTime = Chronos.currentTimeMillis(); private HappyHours() { @@ -76,9 +77,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = System.currentTimeMillis(); + _lastRewardTime = Chronos.currentTimeMillis(); final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true); final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 038d7883b0..7fb3b481dd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -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 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index f7d34dfccd..6615d3e9c8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -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 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 4f95514f8c..b6900127dc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -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)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 64d4112e1f..729838d853 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -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(); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 9801093a20..0e4285c8e3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -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.GraciaSeedsManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -66,7 +67,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 72117290b3..6855d75da1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -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; @@ -117,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5fffc77ae3..8c3faede2d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,6 +24,7 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index aa1d6dd435..ae1bb4e0b2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index ff3b82a10f..21489c89f6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -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(); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index a81161c50a..adb3c27701 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,6 +16,7 @@ */ package handlers.dailymissionhandlers; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -61,9 +62,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(System.currentTimeMillis()); + entry.setLastCompleted(Chronos.currentTimeMillis()); } - else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index 9fee9dd50e..0322107487 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,6 +18,7 @@ package handlers.dailymissionhandlers; import java.util.Calendar; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -63,7 +64,7 @@ public class LoginWeekendDailyMissionHandler extends AbstractDailyMissionHandler final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK); final long lastCompleted = entry.getLastCompleted(); if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY)) // Reward only on weekend. - && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 71928b144a..c2ea6f7a5a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -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.")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 245af11bfa..2abbe8e8e8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -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; @@ -180,7 +181,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.")); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index 3dd1cdc97d..fd92c92ed9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -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) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index f653561c0d..85b92a163b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -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) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index cf3736fc0e..c21718ad0c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -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) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 43b6df41dc..a57194664d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -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; @@ -46,7 +47,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
| Penalty | Expiration Date |
| Unable to join a clan. | "); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +55,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) { htmlContent.append(" | Unable to create a clan. | "); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +63,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(" | Unable to invite a clan member. | "); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 530047a4f2..57bd48cd81 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -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; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index a2eab150c7..f727b3518f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -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; @@ -103,7 +104,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."); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 213e03e20a..5bf36c47d0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -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(" |
| Spoil Chance: x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " | |||||
| Spoil Amount: x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " | |||||
| Expires: " + format.format(endDate) + " | |||||
| Current Date: " + format.format(System.currentTimeMillis()) + " | |||||
| Current Date: " + format.format(Chronos.currentTimeMillis()) + " | |||||
| 1. Premium accounts CAN NOT BE TRANSFERED. | |||||
| 2. Premium does not effect party members. | "); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); sb.append(" | "); sb.append(auction.getHighestBid()); sb.append(" | "); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index f469c39159..2362aa9446 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; @@ -73,7 +74,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -126,7 +127,7 @@ public class ProvisionalHalls extends AbstractNpcAI for (int id : CLAN_HALLS.keySet()) { - if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < Chronos.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -137,7 +138,7 @@ public class ProvisionalHalls extends AbstractNpcAI clanHall.setOwner(player.getClan()); } player.sendMessage("Congratulations! You now own a provisional clan hall!"); - startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -177,7 +178,7 @@ public class ProvisionalHalls extends AbstractNpcAI else if (event.startsWith(HALL_RESET_VAR)) { final String id = event.replace(HALL_RESET_VAR, ""); - if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= Chronos.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 18f813b1a2..a3c74220a9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,6 +19,7 @@ package ai.others.TrainingCamp; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -111,7 +112,7 @@ public class TrainingCamp extends AbstractNpcAI player.teleToLocation(TRAINING_LOCATION); player.setImmobilized(true); // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. - player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), Chronos.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); @@ -203,7 +204,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(System.currentTimeMillis()); + holder.setEndTime(Chronos.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 49dfa6b963..6140daa716 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -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) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index cce5b52533..d97b3c74db 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -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; @@ -94,9 +95,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); @@ -110,7 +111,7 @@ public class GiftOfVitality extends LongTimeEvent { SkillCaster.triggerCast(player, player, GIFT_OF_VITALITY.getSkill()); SkillCaster.triggerCast(player, player, 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; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java index 536ed53fe2..2d3261f1c3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,6 +16,7 @@ */ package events.HappyHours; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +40,7 @@ public class HappyHours extends LongTimeEvent // Other private static final int MIN_LEVEL = 20; private static final int REWARD_INTERVAL = 60 * 60 * 1000; // 1 hour - private static long _lastRewardTime = System.currentTimeMillis(); + private static long _lastRewardTime = Chronos.currentTimeMillis(); private HappyHours() { @@ -76,9 +77,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = System.currentTimeMillis(); + _lastRewardTime = Chronos.currentTimeMillis(); final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true); final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 038d7883b0..7fb3b481dd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -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 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 48a2a27c8d..12d453b3a0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -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 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 4f95514f8c..b6900127dc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -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)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java index 5c332ec4ee..4e185fe8e2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java @@ -18,6 +18,7 @@ package events.TrainingWithDandy; import java.util.Calendar; +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; @@ -66,7 +67,7 @@ public class TrainingWithDandy extends LongTimeEvent { npc.setTarget(player); npc.doCast(DANDY_CH.getSkill()); - player.getVariables().set(GIVE_DANDI_BUFF_VAR, System.currentTimeMillis()); + player.getVariables().set(GIVE_DANDI_BUFF_VAR, Chronos.currentTimeMillis()); player.broadcastStatusUpdate(); htmltext = "33894-2.htm"; break; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 64d4112e1f..729838d853 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -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(); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 9801093a20..0e4285c8e3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -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.GraciaSeedsManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -66,7 +67,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 72117290b3..6855d75da1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -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; @@ -117,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5fffc77ae3..8c3faede2d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,6 +24,7 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -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); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index aa1d6dd435..ae1bb4e0b2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -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); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index ff3b82a10f..21489c89f6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -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(); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index a81161c50a..adb3c27701 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,6 +16,7 @@ */ package handlers.dailymissionhandlers; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -61,9 +62,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(System.currentTimeMillis()); + entry.setLastCompleted(Chronos.currentTimeMillis()); } - else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index 9fee9dd50e..0322107487 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,6 +18,7 @@ package handlers.dailymissionhandlers; import java.util.Calendar; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -63,7 +64,7 @@ public class LoginWeekendDailyMissionHandler extends AbstractDailyMissionHandler final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK); final long lastCompleted = entry.getLastCompleted(); if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY)) // Reward only on weekend. - && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 71928b144a..c2ea6f7a5a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -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.")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 245af11bfa..2abbe8e8e8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -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; @@ -180,7 +181,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.")); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index 3dd1cdc97d..fd92c92ed9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -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) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index f653561c0d..85b92a163b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -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) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index cf3736fc0e..c21718ad0c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -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) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 43b6df41dc..a57194664d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -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; @@ -46,7 +47,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
| Penalty | Expiration Date |
| Unable to join a clan. | "); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +55,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) { htmlContent.append(" | Unable to create a clan. | "); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +63,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(" | Unable to invite a clan member. | "); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 530047a4f2..57bd48cd81 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -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; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index a2eab150c7..f727b3518f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -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; @@ -103,7 +104,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."); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 213e03e20a..5bf36c47d0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -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(" |
| Spoil Chance: x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " | |||||
| Spoil Amount: x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " | |||||
| Expires: " + format.format(endDate) + " | |||||
| Current Date: " + format.format(System.currentTimeMillis()) + " | |||||
| Current Date: " + format.format(Chronos.currentTimeMillis()) + " | |||||
| 1. Premium accounts CAN NOT BE TRANSFERED. | |||||
| 2. Premium does not effect party members. | "); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); sb.append(" | "); sb.append(auction.getHighestBid()); sb.append(" | "); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index f469c39159..2362aa9446 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; @@ -73,7 +74,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -126,7 +127,7 @@ public class ProvisionalHalls extends AbstractNpcAI for (int id : CLAN_HALLS.keySet()) { - if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < Chronos.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -137,7 +138,7 @@ public class ProvisionalHalls extends AbstractNpcAI clanHall.setOwner(player.getClan()); } player.sendMessage("Congratulations! You now own a provisional clan hall!"); - startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -177,7 +178,7 @@ public class ProvisionalHalls extends AbstractNpcAI else if (event.startsWith(HALL_RESET_VAR)) { final String id = event.replace(HALL_RESET_VAR, ""); - if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= Chronos.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 18f813b1a2..a3c74220a9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,6 +19,7 @@ package ai.others.TrainingCamp; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -111,7 +112,7 @@ public class TrainingCamp extends AbstractNpcAI player.teleToLocation(TRAINING_LOCATION); player.setImmobilized(true); // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. - player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), Chronos.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); @@ -203,7 +204,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(System.currentTimeMillis()); + holder.setEndTime(Chronos.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 49dfa6b963..6140daa716 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -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) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index cce5b52533..d97b3c74db 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -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; @@ -94,9 +95,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); @@ -110,7 +111,7 @@ public class GiftOfVitality extends LongTimeEvent { SkillCaster.triggerCast(player, player, GIFT_OF_VITALITY.getSkill()); SkillCaster.triggerCast(player, player, 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; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java index edebac38cf..29c8abcbf5 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,6 +16,7 @@ */ package events.HappyHours; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +40,7 @@ public class HappyHours extends LongTimeEvent // Other private static final int MIN_LEVEL = 20; private static final int REWARD_INTERVAL = 60 * 60 * 1000; // 1 hour - private static long _lastRewardTime = System.currentTimeMillis(); + private static long _lastRewardTime = Chronos.currentTimeMillis(); private HappyHours() { @@ -76,9 +77,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = System.currentTimeMillis(); + _lastRewardTime = Chronos.currentTimeMillis(); final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true); final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_VE_OBTAINED_S1_LUCKY_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 038d7883b0..7fb3b481dd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -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 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index f7d34dfccd..6615d3e9c8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -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 diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index cf11305ced..67f5d5b625 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -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)) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java index 5c332ec4ee..4e185fe8e2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java @@ -18,6 +18,7 @@ package events.TrainingWithDandy; import java.util.Calendar; +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; @@ -66,7 +67,7 @@ public class TrainingWithDandy extends LongTimeEvent { npc.setTarget(player); npc.doCast(DANDY_CH.getSkill()); - player.getVariables().set(GIVE_DANDI_BUFF_VAR, System.currentTimeMillis()); + player.getVariables().set(GIVE_DANDI_BUFF_VAR, Chronos.currentTimeMillis()); player.broadcastStatusUpdate(); htmltext = "33894-2.htm"; break; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 64d4112e1f..729838d853 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -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(); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 9801093a20..0e4285c8e3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -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.GraciaSeedsManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -66,7 +67,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 72117290b3..6855d75da1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -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; @@ -117,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5fffc77ae3..8c3faede2d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,6 +24,7 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -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); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index aa1d6dd435..ae1bb4e0b2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -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); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index ff3b82a10f..21489c89f6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -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(); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index a81161c50a..adb3c27701 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,6 +16,7 @@ */ package handlers.dailymissionhandlers; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -61,9 +62,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(System.currentTimeMillis()); + entry.setLastCompleted(Chronos.currentTimeMillis()); } - else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index 9fee9dd50e..0322107487 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,6 +18,7 @@ package handlers.dailymissionhandlers; import java.util.Calendar; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -63,7 +64,7 @@ public class LoginWeekendDailyMissionHandler extends AbstractDailyMissionHandler final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK); final long lastCompleted = entry.getLastCompleted(); if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY)) // Reward only on weekend. - && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index bfe0c1ce4b..dda4fa4bdb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -17,6 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -55,7 +56,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = System.currentTimeMillis(); + final long currentTime = Chronos.currentTimeMillis(); long endTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, 0); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= Config.TIME_LIMITED_MAX_ADDED_TIME)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 71928b144a..c2ea6f7a5a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -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.")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 245af11bfa..2abbe8e8e8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -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; @@ -180,7 +181,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.")); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index 3dd1cdc97d..fd92c92ed9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -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) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index f653561c0d..85b92a163b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -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) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index cf3736fc0e..c21718ad0c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -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) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 43b6df41dc..a57194664d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -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; @@ -46,7 +47,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
| Penalty | Expiration Date |
| Unable to join a clan. | "); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +55,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) { htmlContent.append(" | Unable to create a clan. | "); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +63,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(" | Unable to invite a clan member. | "); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 530047a4f2..57bd48cd81 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -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; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index a2eab150c7..f727b3518f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -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; @@ -103,7 +104,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."); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 213e03e20a..5bf36c47d0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -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(" |
| Spoil Chance: x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " | |||||
| Spoil Amount: x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " | |||||
| Expires: " + format.format(endDate) + " | |||||
| Current Date: " + format.format(System.currentTimeMillis()) + " | |||||
| Current Date: " + format.format(Chronos.currentTimeMillis()) + " | |||||
| 1. Premium accounts CAN NOT BE TRANSFERED. | |||||
| 2. Premium does not effect party members. | "); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + auction.getRemaingTime()).atZone(ZoneId.systemDefault()))); sb.append(" | "); sb.append(auction.getHighestBid()); sb.append(" | "); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index f469c39159..2362aa9446 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.Location; @@ -73,7 +74,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -126,7 +127,7 @@ public class ProvisionalHalls extends AbstractNpcAI for (int id : CLAN_HALLS.keySet()) { - if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < Chronos.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -137,7 +138,7 @@ public class ProvisionalHalls extends AbstractNpcAI clanHall.setOwner(player.getClan()); } player.sendMessage("Congratulations! You now own a provisional clan hall!"); - startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -177,7 +178,7 @@ public class ProvisionalHalls extends AbstractNpcAI else if (event.startsWith(HALL_RESET_VAR)) { final String id = event.replace(HALL_RESET_VAR, ""); - if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= Chronos.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 18f813b1a2..a3c74220a9 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,6 +19,7 @@ package ai.others.TrainingCamp; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -111,7 +112,7 @@ public class TrainingCamp extends AbstractNpcAI player.teleToLocation(TRAINING_LOCATION); player.setImmobilized(true); // @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it. - player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), Chronos.currentTimeMillis(), -1)); final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration; player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0, timeRemaining)); startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player); @@ -203,7 +204,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(System.currentTimeMillis()); + holder.setEndTime(Chronos.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 49dfa6b963..6140daa716 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -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) { diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index cce5b52533..d97b3c74db 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -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; @@ -94,9 +95,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); @@ -110,7 +111,7 @@ public class GiftOfVitality extends LongTimeEvent { SkillCaster.triggerCast(player, player, GIFT_OF_VITALITY.getSkill()); SkillCaster.triggerCast(player, player, 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; diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java index edebac38cf..29c8abcbf5 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,6 +16,7 @@ */ package events.HappyHours; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -39,7 +40,7 @@ public class HappyHours extends LongTimeEvent // Other private static final int MIN_LEVEL = 20; private static final int REWARD_INTERVAL = 60 * 60 * 1000; // 1 hour - private static long _lastRewardTime = System.currentTimeMillis(); + private static long _lastRewardTime = Chronos.currentTimeMillis(); private HappyHours() { @@ -76,9 +77,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = System.currentTimeMillis(); + _lastRewardTime = Chronos.currentTimeMillis(); final ExShowScreenMessage screenMsg = new ExShowScreenMessage("You obtained 20 Sibi's coins.", ExShowScreenMessage.TOP_CENTER, 7000, 0, true, true); final SystemMessage systemMsg = new SystemMessage(SystemMessageId.YOU_VE_OBTAINED_S1_LUCKY_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 038d7883b0..7fb3b481dd 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -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 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index f7d34dfccd..6615d3e9c8 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -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 diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 4eccf4b578..9f1be4ab6a 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -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)) diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java index 5c332ec4ee..4e185fe8e2 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java @@ -18,6 +18,7 @@ package events.TrainingWithDandy; import java.util.Calendar; +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; @@ -66,7 +67,7 @@ public class TrainingWithDandy extends LongTimeEvent { npc.setTarget(player); npc.doCast(DANDY_CH.getSkill()); - player.getVariables().set(GIVE_DANDI_BUFF_VAR, System.currentTimeMillis()); + player.getVariables().set(GIVE_DANDI_BUFF_VAR, Chronos.currentTimeMillis()); player.broadcastStatusUpdate(); htmltext = "33894-2.htm"; break; diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 64d4112e1f..729838d853 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -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(); } } diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 9801093a20..0e4285c8e3 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -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.GraciaSeedsManager; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -66,7 +67,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 72117290b3..6855d75da1 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -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; @@ -117,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 5fffc77ae3..8c3faede2d 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,6 +24,7 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -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); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index aa1d6dd435..ae1bb4e0b2 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -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); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index ff3b82a10f..21489c89f6 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -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(); } } diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index a81161c50a..adb3c27701 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,6 +16,7 @@ */ package handlers.dailymissionhandlers; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -61,9 +62,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(System.currentTimeMillis()); + entry.setLastCompleted(Chronos.currentTimeMillis()); } - else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index 9fee9dd50e..0322107487 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,6 +18,7 @@ package handlers.dailymissionhandlers; import java.util.Calendar; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -63,7 +64,7 @@ public class LoginWeekendDailyMissionHandler extends AbstractDailyMissionHandler final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK); final long lastCompleted = entry.getLastCompleted(); if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY)) // Reward only on weekend. - && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0b04c4ff59..5168629d5f 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -17,6 +17,7 @@ package handlers.effecthandlers; import org.l2jmobius.Config; +import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -55,7 +56,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = System.currentTimeMillis(); + final long currentTime = Chronos.currentTimeMillis(); long endTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_RESET_TIME + _zoneId, 0); if ((_zoneId == 8) && (endTime > currentTime) && (((endTime - currentTime) + _time) >= Config.TIME_LIMITED_MAX_ADDED_TIME_WEEKLY)) { diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 71928b144a..c2ea6f7a5a 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -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.")); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 245af11bfa..2abbe8e8e8 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -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; @@ -180,7 +181,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.")); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index 3dd1cdc97d..fd92c92ed9 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -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) { diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index f653561c0d..85b92a163b 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -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) { diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index cf3736fc0e..c21718ad0c 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -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) { diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 43b6df41dc..a57194664d 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -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; @@ -46,7 +47,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
| Penalty | Expiration Date |
| Unable to join a clan. | "); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +55,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) { htmlContent.append(" | Unable to create a clan. | "); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +63,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(" | Unable to invite a clan member. | "); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 530047a4f2..57bd48cd81 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -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; } diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index a2eab150c7..f727b3518f 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -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; @@ -103,7 +104,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."); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 213e03e20a..5bf36c47d0 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -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(" |
| Spoil Chance: x" + (Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " | |||||
| Spoil Amount: x" + (Config.RATE_SPOIL_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " | |||||
| Expires: " + format.format(endDate) + " | |||||
| Current Date: " + format.format(System.currentTimeMillis()) + " | |||||
| Current Date: " + format.format(Chronos.currentTimeMillis()) + " | |||||
| 1. Premium accounts CAN NOT BE TRANSFERED. | |||||
| 2. Premium does not effect party members. |