From 00fa62eed8643e9066d8b07ec16068720720f427 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 8 Apr 2022 23:25:52 +0000 Subject: [PATCH] Dropped Chronos. --- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Anakim/Anakim.java | 13 ++- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Lilith/Lilith.java | 13 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../ai/others/TrainingCamp/TrainingCamp.java | 5 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../Q00307_ControlDeviceOfTheGiants.java | 5 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 55 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../network/serverpackets/ServerList.java | 3 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Anakim/Anakim.java | 13 ++- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../data/scripts/ai/bosses/Lilith/Lilith.java | 13 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../ai/others/TrainingCamp/TrainingCamp.java | 5 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../Q00307_ControlDeviceOfTheGiants.java | 5 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Anakim/Anakim.java | 13 ++- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../data/scripts/ai/bosses/Lilith/Lilith.java | 13 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../ai/others/TrainingCamp/TrainingCamp.java | 5 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Anakim/Anakim.java | 13 ++- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../data/scripts/ai/bosses/Lilith/Lilith.java | 13 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../ai/others/TrainingCamp/TrainingCamp.java | 5 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Anakim/Anakim.java | 13 ++- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../data/scripts/ai/bosses/Lilith/Lilith.java | 13 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../ai/others/TrainingCamp/TrainingCamp.java | 5 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Anakim/Anakim.java | 13 ++- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../ai/bosses/EtisVanEtina/EtisVanEtina.java | 11 ++- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../data/scripts/ai/bosses/Lilith/Lilith.java | 13 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../ai/others/TrainingCamp/TrainingCamp.java | 5 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Anakim/Anakim.java | 11 ++- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../ai/bosses/EtisVanEtina/EtisVanEtina.java | 11 ++- .../scripts/ai/bosses/Fafurion/Fafurion.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../data/scripts/ai/bosses/Lilith/Lilith.java | 13 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../ai/others/TrainingCamp/TrainingCamp.java | 5 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../TrainingWithDandy/TrainingWithDandy.java | 3 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Anakim/Anakim.java | 11 ++- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../ai/bosses/EtisVanEtina/EtisVanEtina.java | 11 ++- .../scripts/ai/bosses/Fafurion/Fafurion.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../data/scripts/ai/bosses/Lilith/Lilith.java | 13 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../TrainingWithDandy/TrainingWithDandy.java | 3 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../Q10825_ForVictory/Q10825_ForVictory.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/RankManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 5 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../ai/bosses/EtisVanEtina/EtisVanEtina.java | 11 ++- .../scripts/ai/bosses/Fafurion/Fafurion.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../data/scripts/ai/others/AetherDrops.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../TrainingWithDandy/TrainingWithDandy.java | 3 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../effecthandlers/DecreaseWaitingTime.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../KastiaExceptional/KastiaExceptional.java | 3 +- .../KastiaExtreme/KastiaExtreme.java | 3 +- .../instances/KastiaHard/KastiaHard.java | 3 +- .../instances/KastiaLow/KastiaLow.java | 3 +- .../instances/KastiaMedium/KastiaMedium.java | 3 +- .../instances/KrofinNest/KrofinNest.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../ThroneOfHeroesGoldberg.java | 3 +- .../ThroneOfHeroesMaryReed.java | 3 +- .../ThroneOfHeroes/ThroneOfHeroesTauti.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/RankManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../org/l2jmobius/gameserver/model/World.java | 7 +- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 7 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../RequestExHomunculusCreateStart.java | 3 +- .../homunculus/RequestExHomunculusSummon.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 5 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../ai/bosses/EtisVanEtina/EtisVanEtina.java | 11 ++- .../scripts/ai/bosses/Fafurion/Fafurion.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../data/scripts/ai/others/AetherDrops.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ai/others/GreedyTreasureChests.java | 3 +- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../others/WaterDragonEliteSupplyDrops.java | 3 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../scripts/events/DreamMaker/DreamMaker.java | 5 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../events/LegendsMark/LegendsMark.java | 3 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../TrainingWithDandy/TrainingWithDandy.java | 3 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../effecthandlers/DecreaseWaitingTime.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../KastiaExceptional/KastiaExceptional.java | 3 +- .../KastiaExtreme/KastiaExtreme.java | 3 +- .../instances/KastiaHard/KastiaHard.java | 3 +- .../instances/KastiaLow/KastiaLow.java | 3 +- .../instances/KastiaMedium/KastiaMedium.java | 3 +- .../instances/KrofinNest/KrofinNest.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../instances/SpiritForest/SpiritForest.java | 3 +- .../ThroneOfHeroesGoldberg.java | 3 +- .../ThroneOfHeroesMaryReed.java | 3 +- .../ThroneOfHeroes/ThroneOfHeroesTauti.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/RankManager.java | 3 +- .../events/BalthusEventManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../org/l2jmobius/gameserver/model/World.java | 7 +- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 7 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../RequestExHomunculusCreateStart.java | 3 +- .../homunculus/RequestExHomunculusSummon.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 5 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../ai/bosses/EtisVanEtina/EtisVanEtina.java | 11 ++- .../scripts/ai/bosses/Fafurion/Fafurion.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../data/scripts/ai/others/AetherDrops.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ai/others/GreedyTreasureChests.java | 3 +- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../others/WaterDragonEliteSupplyDrops.java | 3 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../scripts/events/DreamMaker/DreamMaker.java | 5 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../events/LegendsMark/LegendsMark.java | 3 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../TrainingWithDandy/TrainingWithDandy.java | 3 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../effecthandlers/DecreaseWaitingTime.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../KastiaExceptional/KastiaExceptional.java | 3 +- .../KastiaExtreme/KastiaExtreme.java | 3 +- .../instances/KastiaHard/KastiaHard.java | 3 +- .../instances/KastiaLow/KastiaLow.java | 3 +- .../instances/KastiaMedium/KastiaMedium.java | 3 +- .../instances/KrofinNest/KrofinNest.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../instances/SpiritForest/SpiritForest.java | 3 +- .../ThroneOfHeroesGoldberg.java | 3 +- .../ThroneOfHeroesMaryReed.java | 3 +- .../ThroneOfHeroes/ThroneOfHeroesTauti.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/RankManager.java | 3 +- .../events/BalthusEventManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../org/l2jmobius/gameserver/model/World.java | 7 +- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 7 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../RequestExHomunculusCreateStart.java | 3 +- .../homunculus/RequestExHomunculusSummon.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 5 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../GainakUnderground/Lailly/Lailly.java | 3 +- .../KeucereusAllianceBase/LindviorScene.java | 5 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../SeedOfAnnihilation.java | 9 +-- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../ai/bosses/Baylor/BaylorWarzone.java | 3 +- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../ai/bosses/EtisVanEtina/EtisVanEtina.java | 11 ++- .../scripts/ai/bosses/Fafurion/Fafurion.java | 5 +- .../IceQueensCastleBattle.java | 5 +- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Helios/Helios.java | 5 +- .../data/scripts/ai/bosses/Kelbim/Kelbim.java | 11 ++- .../scripts/ai/bosses/Lindvior/Lindvior.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../data/scripts/ai/bosses/Ramona/Ramona.java | 21 +++-- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Trasken/Trasken.java | 5 +- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../data/scripts/ai/others/AetherDrops.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ai/others/GreedyTreasureChests.java | 3 +- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../others/WaterDragonEliteSupplyDrops.java | 3 +- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../scripts/events/DreamMaker/DreamMaker.java | 5 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../events/LegendsMark/LegendsMark.java | 3 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../TrainingWithDandy/TrainingWithDandy.java | 3 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../effecthandlers/DecreaseWaitingTime.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../AshenShadowRevolutionaries.java | 3 +- .../CastleDungeon/CastleDungeon.java | 5 +- .../CeremonyOfChaos/CeremonyOfChaos.java | 3 +- .../instances/CommandPost/CommandPost.java | 3 +- .../FortressDungeon/FortressDungeon.java | 5 +- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../KastiaExceptional/KastiaExceptional.java | 3 +- .../KastiaExtreme/KastiaExtreme.java | 3 +- .../instances/KastiaHard/KastiaHard.java | 3 +- .../instances/KastiaLow/KastiaLow.java | 3 +- .../instances/KastiaMedium/KastiaMedium.java | 3 +- .../instances/KrofinNest/KrofinNest.java | 3 +- .../NightmareKamaloka/NightmareKamaloka.java | 3 +- .../PailakaRuneCastle/PailakaRuneCastle.java | 7 +- .../instances/SpiritForest/SpiritForest.java | 3 +- .../ThroneOfHeroesGoldberg.java | 3 +- .../ThroneOfHeroesMaryReed.java | 3 +- .../ThroneOfHeroes/ThroneOfHeroesTauti.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/RankManager.java | 3 +- .../events/BalthusEventManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../org/l2jmobius/gameserver/model/World.java | 7 +- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 57 +++++++------ .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 29 ++++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 7 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../enchant/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../RequestExHomunculusCreateStart.java | 3 +- .../homunculus/RequestExHomunculusSummon.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 5 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/HennaInfo.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../gameserver/GameTimeTaskManager.java | 7 +- .../gameserver/model/actor/Creature.java | 9 +-- .../gameserver/model/actor/Player.java | 9 +-- .../gameserver/network/ClientThread.java | 9 +-- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../loginserver/LoginController.java | 3 +- .../java/org/l2jmobius/util/Chronos.java | 80 ------------------- .../game/data/scripts/ai/bosses/Antharas.java | 21 +++-- .../game/data/scripts/ai/bosses/Baium.java | 13 ++- .../game/data/scripts/ai/bosses/Core.java | 5 +- .../game/data/scripts/ai/bosses/Orfen.java | 5 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 5 +- .../game/data/scripts/ai/bosses/Valakas.java | 13 ++- .../game/data/scripts/ai/bosses/Zaken.java | 5 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../l2jmobius/gameserver/ai/NpcWalkerAI.java | 5 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/sql/ClanTable.java | 7 +- .../data/sql/OfflineTraderTable.java | 3 +- .../gameserver/data/sql/TradeListTable.java | 7 +- .../admincommandhandlers/AdminDonator.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handler/itemhandlers/HeroCustomItem.java | 3 +- .../handler/itemhandlers/MOSKey.java | 5 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/PetitionManager.java | 3 +- .../instancemanager/TradeManager.java | 7 +- .../events/EventsGlobalTask.java | 3 +- .../instancemanager/games/Lottery.java | 17 ++-- .../l2jmobius/gameserver/model/Timestamp.java | 7 +- .../gameserver/model/actor/Attackable.java | 7 +- .../gameserver/model/actor/Creature.java | 11 ++- .../l2jmobius/gameserver/model/actor/Npc.java | 9 +-- .../gameserver/model/actor/Player.java | 49 ++++++------ .../model/actor/instance/Auctioneer.java | 7 +- .../model/actor/instance/VillageMaster.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/item/instance/Item.java | 3 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/residences/ClanHall.java | 29 ++++--- .../model/residences/ClanHallAuction.java | 9 +-- .../model/sevensigns/SevenSigns.java | 3 +- .../model/sevensigns/SevenSignsFestival.java | 11 ++- .../gameserver/model/siege/ClanHallSiege.java | 5 +- .../gameserver/model/siege/Siege.java | 7 +- .../clanhalls/BanditStrongholdSiege.java | 7 +- .../siege/clanhalls/DevastatedCastle.java | 7 +- .../siege/clanhalls/FortressOfResistance.java | 7 +- .../siege/clanhalls/WildBeastFarmSiege.java | 7 +- .../gameserver/model/spawn/Spawn.java | 3 +- .../gameserver/model/zone/type/BossZone.java | 9 +-- .../gameserver/network/GameClient.java | 5 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/DlgAnswer.java | 2 +- .../network/clientpackets/EnterWorld.java | 5 +- .../network/clientpackets/Logout.java | 5 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../clientpackets/RequestJoinSiege.java | 5 +- .../RequestOustPledgeMember.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/serverpackets/CharSelectInfo.java | 5 +- .../serverpackets/GMViewPledgeInfo.java | 3 +- .../PledgeReceiveMemberInfo.java | 3 +- .../PledgeShowMemberListAll.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 5 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../l2jmobius/gameserver/util/MinionList.java | 5 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 9 +-- .../l2jmobius/telnet/GameStatusThread.java | 3 +- .../l2jmobius/telnet/TelnetStatusThread.java | 3 +- .../game/data/scripts/ai/bosses/Antharas.java | 21 +++-- .../game/data/scripts/ai/bosses/Baium.java | 13 ++- .../game/data/scripts/ai/bosses/Benom.java | 9 +-- .../game/data/scripts/ai/bosses/Core.java | 5 +- .../data/scripts/ai/bosses/Frintezza.java | 11 ++- .../game/data/scripts/ai/bosses/Orfen.java | 5 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 5 +- .../game/data/scripts/ai/bosses/Valakas.java | 13 ++- .../data/scripts/ai/bosses/VanHalter.java | 5 +- .../game/data/scripts/ai/bosses/Zaken.java | 5 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../l2jmobius/gameserver/ai/NpcWalkerAI.java | 5 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/sql/ClanTable.java | 7 +- .../data/sql/OfflineTraderTable.java | 3 +- .../gameserver/data/sql/TradeListTable.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../admincommandhandlers/AdminDonator.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handler/itemhandlers/HeroCustomItem.java | 3 +- .../handler/itemhandlers/MOSKey.java | 5 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../FishingChampionshipManager.java | 11 ++- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/PetitionManager.java | 3 +- .../instancemanager/TradeManager.java | 7 +- .../events/EventsGlobalTask.java | 3 +- .../instancemanager/games/Lottery.java | 17 ++-- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/Timestamp.java | 7 +- .../gameserver/model/actor/Attackable.java | 7 +- .../gameserver/model/actor/Creature.java | 11 ++- .../l2jmobius/gameserver/model/actor/Npc.java | 9 +-- .../gameserver/model/actor/Player.java | 49 ++++++------ .../model/actor/instance/Auctioneer.java | 7 +- .../model/actor/instance/VillageMaster.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/item/instance/Item.java | 3 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/residences/ClanHall.java | 29 ++++--- .../model/residences/ClanHallAuction.java | 9 +-- .../model/sevensigns/SevenSigns.java | 3 +- .../model/sevensigns/SevenSignsFestival.java | 11 ++- .../gameserver/model/siege/ClanHallSiege.java | 5 +- .../gameserver/model/siege/Siege.java | 7 +- .../clanhalls/BanditStrongholdSiege.java | 7 +- .../siege/clanhalls/DevastatedCastle.java | 7 +- .../siege/clanhalls/FortressOfResistance.java | 7 +- .../siege/clanhalls/WildBeastFarmSiege.java | 7 +- .../gameserver/model/spawn/Spawn.java | 3 +- .../gameserver/model/zone/type/BossZone.java | 9 +-- .../gameserver/network/GameClient.java | 5 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/DlgAnswer.java | 3 +- .../network/clientpackets/EnterWorld.java | 5 +- .../network/clientpackets/Logout.java | 5 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../clientpackets/RequestJoinSiege.java | 5 +- .../RequestOustPledgeMember.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/serverpackets/CharSelectInfo.java | 5 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 5 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../l2jmobius/gameserver/util/MinionList.java | 5 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../network/serverpackets/ServerList.java | 3 +- .../l2jmobius/telnet/GameStatusThread.java | 3 +- .../l2jmobius/telnet/TelnetStatusThread.java | 3 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../scripts/ai/areas/Gracia/AI/Lindvior.java | 5 +- .../HallOfErosionAttack.java | 5 +- .../HallOfErosionDefence.java | 5 +- .../HallOfSufferingAttack.java | 7 +- .../HallOfSufferingDefence.java | 7 +- .../HeartInfinityAttack.java | 7 +- .../HeartInfinityDefence.java | 7 +- .../SeedOfDestruction/SeedOfDestruction.java | 13 ++- .../AI/Zones/TowerOfNaia/TowerOfNaia.java | 7 +- .../DemonPrinceFloor/DemonPrinceFloor.java | 3 +- .../Instances/RankuFloor/RankuFloor.java | 3 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../scripts/ai/bosses/DrChaos/DrChaos.java | 11 ++- .../ai/bosses/Frintezza/Frintezza.java | 13 ++- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../RainbowSpringsChateau.java | 3 +- .../CharacterBirthday/CharacterBirthday.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../admincommandhandlers/AdminCHSiege.java | 3 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../AdminTerritoryWar.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../usercommandhandlers/InstanceZone.java | 3 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../scripts/instances/AbstractInstance.java | 5 +- .../CastleDungeon/CastleDungeon.java | 3 +- .../CavernOfThePirateCaptain.java | 5 +- .../instances/ChambersOfDelusion/Chamber.java | 13 ++- .../CrystalCaverns/CrystalCaverns.java | 15 ++-- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../Q00307_ControlDeviceOfTheGiants.java | 5 +- .../Q00311_ExpulsionOfEvilSpirits.java | 7 +- .../Q00511_AwlUnderFoot.java | 5 +- .../Q00610_MagicalPowerOfWaterPart2.java | 5 +- .../Q00616_MagicalPowerOfFirePart2.java | 5 +- .../Q00726_LightWithinTheDarkness.java | 5 +- .../Q00727_HopeWithinTheDarkness.java | 5 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../FishingChampionshipManager.java | 11 ++- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 3 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/SoDManager.java | 7 +- .../instancemanager/SoIManager.java | 5 +- .../instancemanager/TerritoryWarManager.java | 5 +- .../instancemanager/games/BlockChecker.java | 5 +- .../instancemanager/games/Lottery.java | 17 ++-- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/Message.java | 7 +- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/WorldObject.java | 3 +- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 49 ++++++------ .../model/actor/instance/Auctioneer.java | 7 +- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../tasks/player/LookingForFishTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../model/instancezone/Instance.java | 13 ++- .../gameserver/model/item/instance/Item.java | 9 +-- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGame.java | 5 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AuctionableHall.java | 13 ++- .../gameserver/model/residences/ClanHall.java | 5 +- .../model/residences/ClanHallAuction.java | 9 +-- .../model/sevensigns/SevenSigns.java | 3 +- .../model/sevensigns/SevenSignsFestival.java | 11 ++- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/FortSiege.java | 5 +- .../gameserver/model/siege/Siege.java | 5 +- .../siege/clanhalls/ClanHallSiegeEngine.java | 5 +- .../model/siege/clanhalls/SiegableHall.java | 3 +- .../gameserver/model/zone/type/BossZone.java | 9 +-- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 7 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinDominionWar.java | 3 +- .../clientpackets/RequestJoinSiege.java | 5 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../network/serverpackets/ServerList.java | 3 +- .../scripts/ai/areas/FantasyIsle/Parade.java | 3 +- .../ai/areas/FantasyIsle/TalentShow.java | 3 +- .../scripts/ai/areas/Gracia/AI/Lindvior.java | 5 +- .../SeedOfAnnihilation.java | 9 +-- .../HallOfErosionAttack.java | 5 +- .../HallOfErosionDefence.java | 5 +- .../HallOfSufferingAttack.java | 7 +- .../HallOfSufferingDefence.java | 7 +- .../HeartInfinityAttack.java | 7 +- .../HeartInfinityDefence.java | 7 +- .../SeedOfDestruction/SeedOfDestruction.java | 13 ++- .../AI/Zones/TowerOfNaia/TowerOfNaia.java | 7 +- .../DemonPrinceFloor/DemonPrinceFloor.java | 3 +- .../Instances/RankuFloor/RankuFloor.java | 3 +- .../ai/areas/Rune/RuneCastle/Venom/Venom.java | 3 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Beleth/Beleth.java | 9 +-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../scripts/ai/bosses/DrChaos/DrChaos.java | 11 ++- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ai/bosses/QueenShyeed/QueenShyeed.java | 5 +- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../PriestOfBlessing/PriestOfBlessing.java | 13 ++- .../RainbowSpringsChateau.java | 3 +- .../FreyaCelebration/FreyaCelebration.java | 3 +- .../events/GiftOfVitality/GiftOfVitality.java | 7 +- .../LoveYourGatekeeper.java | 7 +- .../MasterOfEnchanting.java | 7 +- .../events/SavingSanta/SavingSanta.java | 11 ++- .../admincommandhandlers/AdminCHSiege.java | 3 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../AdminTerritoryWar.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../usercommandhandlers/InstanceZone.java | 3 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../scripts/instances/AbstractInstance.java | 5 +- .../CastleDungeon/CastleDungeon.java | 3 +- .../CavernOfThePirateCaptain.java | 7 +- .../instances/ChambersOfDelusion/Chamber.java | 13 ++- .../CrystalCaverns/CrystalCaverns.java | 15 ++-- .../FinalEmperialTomb/FinalEmperialTomb.java | 3 +- .../FinalEmperialTomb/ScarletVanHalisha.java | 7 +- .../IceQueensCastleBattle.java | 9 +-- .../scripts/instances/Kamaloka/Kamaloka.java | 3 +- .../Q00307_ControlDeviceOfTheGiants.java | 5 +- .../Q00311_ExpulsionOfEvilSpirits.java | 7 +- .../Q00511_AwlUnderFoot.java | 5 +- .../Q00610_MagicalPowerOfWaterPart2.java | 5 +- .../Q00616_MagicalPowerOfFirePart2.java | 5 +- .../Q00726_LightWithinTheDarkness.java | 5 +- .../Q00727_HopeWithinTheDarkness.java | 5 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../FishingChampionshipManager.java | 11 ++- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 3 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/SoDManager.java | 7 +- .../instancemanager/SoIManager.java | 5 +- .../instancemanager/TerritoryWarManager.java | 5 +- .../instancemanager/games/BlockChecker.java | 5 +- .../instancemanager/games/Lottery.java | 17 ++-- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/Message.java | 7 +- .../org/l2jmobius/gameserver/model/Nevit.java | 3 +- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/WorldObject.java | 3 +- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 47 ++++++----- .../model/actor/instance/Auctioneer.java | 7 +- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../tasks/player/LookingForFishTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../model/instancezone/Instance.java | 13 ++- .../gameserver/model/item/instance/Item.java | 9 +-- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AuctionableHall.java | 13 ++- .../gameserver/model/residences/ClanHall.java | 5 +- .../model/residences/ClanHallAuction.java | 9 +-- .../model/sevensigns/SevenSigns.java | 3 +- .../model/sevensigns/SevenSignsFestival.java | 11 ++- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/FortSiege.java | 5 +- .../gameserver/model/siege/Siege.java | 5 +- .../siege/clanhalls/ClanHallSiegeEngine.java | 5 +- .../model/siege/clanhalls/SiegableHall.java | 3 +- .../gameserver/model/zone/type/BossZone.java | 9 +-- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 5 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinDominionWar.java | 3 +- .../clientpackets/RequestJoinSiege.java | 5 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../network/serverpackets/ServerList.java | 3 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 59 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 59 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 59 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 59 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../LastImperialTomb/ScarletVanHalisha.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 59 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../LastImperialTomb/ScarletVanHalisha.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/RankManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 59 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 5 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../FourSepulchers/FourSepulchers.java | 5 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../scripts/ai/bosses/DrChaos/DrChaos.java | 11 ++- .../bosses/Frintezza/ScarletVanHalisha.java | 7 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../scripts/ai/bosses/Sailren/Sailren.java | 11 ++- .../scripts/ai/bosses/Valakas/Valakas.java | 13 ++- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../instancemanager/games/Lottery.java | 17 ++-- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 5 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 59 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 5 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 5 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../ai/areas/OrcBarracks/Tarba/Tarba.java | 3 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../BlossomFestival/BlossomFestival.java | 3 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../effecthandlers/SayhaGraceSupport.java | 9 +-- .../handlers/itemhandlers/LimitedSayha.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../LastImperialTomb/ScarletVanHalisha.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/RankManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 7 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 61 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../model/actor/stat/PlayerStat.java | 3 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 7 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 5 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../clientpackets/pet/ExPetEquipItem.java | 3 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../teleports/ExTeleportToRaidPosition.java | 5 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../Hellbound/IvoryTowerTeleportZones.java | 3 +- .../ai/areas/OrcBarracks/Tarba/Tarba.java | 3 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../BlossomFestival/BlossomFestival.java | 3 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../effecthandlers/SayhaGraceSupport.java | 9 +-- .../handlers/itemhandlers/LimitedSayha.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../LastImperialTomb/ScarletVanHalisha.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/PurgeRankingManager.java | 5 +- .../instancemanager/RankManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 7 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 61 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../model/actor/stat/PlayerStat.java | 3 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 7 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 7 +- .../RequestPledgeWaitingUserAccept.java | 3 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../clientpackets/pet/ExPetEquipItem.java | 3 +- .../RequestExPledgeEnemyRegister.java | 3 +- .../RequestExPledgeDonationInfo.java | 3 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../teleports/ExTeleportToRaidPosition.java | 5 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../Hellbound/IvoryTowerTeleportZones.java | 3 +- .../ai/areas/OrcBarracks/Tarba/Tarba.java | 3 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../BlossomFestival/BlossomFestival.java | 3 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../effecthandlers/SayhaGraceSupport.java | 9 +-- .../handlers/itemhandlers/LimitedSayha.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../LastImperialTomb/ScarletVanHalisha.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/PurgeRankingManager.java | 5 +- .../instancemanager/RankManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 7 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 61 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../model/actor/stat/PlayerStat.java | 3 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 7 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../clientpackets/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 7 +- .../RequestPledgeWaitingUserAccept.java | 3 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../clientpackets/pet/ExPetEquipItem.java | 3 +- .../RequestExPledgeEnemyRegister.java | 3 +- .../RequestExPledgeDonationInfo.java | 3 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../teleports/ExTeleportToRaidPosition.java | 5 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- .../Hellbound/IvoryTowerTeleportZones.java | 3 +- .../ai/areas/OrcBarracks/Tarba/Tarba.java | 3 +- .../scripts/ai/bosses/Antharas/Antharas.java | 13 ++- .../data/scripts/ai/bosses/Baium/Baium.java | 15 ++-- .../data/scripts/ai/bosses/Core/Core.java | 5 +- .../data/scripts/ai/bosses/Orfen/Orfen.java | 5 +- .../scripts/ai/bosses/QueenAnt/QueenAnt.java | 5 +- .../data/scripts/ai/bosses/Zaken/Zaken.java | 5 +- .../ClanHallAuctioneer.java | 9 +-- .../ProvisionalHalls/ProvisionalHalls.java | 9 +-- .../scripts/custom/events/TeamVsTeam/TvT.java | 2 +- .../BlossomFestival/BlossomFestival.java | 3 +- .../scripts/events/HappyHours/HappyHours.java | 7 +- .../AdminCursedWeapons.java | 3 +- .../AdminGraciaSeeds.java | 3 +- .../AdminInstanceZone.java | 3 +- .../admincommandhandlers/AdminPunishment.java | 3 +- .../admincommandhandlers/AdminServerInfo.java | 5 +- .../handlers/bypasshandlers/FindPvP.java | 3 +- .../LoginMonthDailyMissionHandler.java | 5 +- .../LoginWeekendDailyMissionHandler.java | 3 +- .../effecthandlers/AddHuntingTime.java | 3 +- .../effecthandlers/SayhaGraceSupport.java | 9 +-- .../handlers/itemhandlers/LimitedSayha.java | 3 +- .../punishmenthandlers/ChatBanHandler.java | 3 +- .../punishmenthandlers/JailHandler.java | 3 +- .../handlers/telnethandlers/player/Ban.java | 3 +- .../telnethandlers/player/BanChat.java | 3 +- .../handlers/telnethandlers/player/Jail.java | 3 +- .../usercommandhandlers/ClanPenalty.java | 7 +- .../handlers/usercommandhandlers/Time.java | 3 +- .../voicedcommandhandlers/ChatAdmin.java | 3 +- .../voicedcommandhandlers/Premium.java | 3 +- .../LastImperialTomb/ScarletVanHalisha.java | 7 +- .../org/l2jmobius/commons/util/Chronos.java | 80 ------------------- .../org/l2jmobius/gameserver/GameServer.java | 5 +- .../org/l2jmobius/gameserver/Shutdown.java | 7 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 3 +- .../cache/WarehouseCacheManager.java | 5 +- .../gameserver/data/BotReportTable.java | 13 ++- .../gameserver/data/sql/ClanTable.java | 5 +- .../data/sql/OfflineTraderTable.java | 3 +- .../handler/AbstractDailyMissionHandler.java | 3 +- .../handler/AdminCommandHandler.java | 5 +- .../instancemanager/AntiFeedManager.java | 5 +- .../instancemanager/CastleManorManager.java | 3 +- .../ClanHallAuctionManager.java | 3 +- .../instancemanager/CursedWeaponsManager.java | 3 +- .../instancemanager/DBSpawnManager.java | 7 +- .../instancemanager/DailyTaskManager.java | 5 +- .../instancemanager/GraciaSeedsManager.java | 7 +- .../gameserver/instancemanager/IdManager.java | 7 +- .../instancemanager/InstanceManager.java | 7 +- .../instancemanager/ItemsOnGroundManager.java | 3 +- .../instancemanager/MentorManager.java | 3 +- .../instancemanager/PremiumManager.java | 5 +- .../instancemanager/PunishmentManager.java | 3 +- .../instancemanager/PurgeRankingManager.java | 5 +- .../instancemanager/RankManager.java | 3 +- .../instancemanager/games/BlockChecker.java | 5 +- .../gameserver/model/CursedWeapon.java | 9 +-- .../l2jmobius/gameserver/model/ItemInfo.java | 5 +- .../l2jmobius/gameserver/model/Message.java | 11 ++- .../l2jmobius/gameserver/model/Petition.java | 3 +- .../org/l2jmobius/gameserver/model/Spawn.java | 3 +- .../l2jmobius/gameserver/model/TimeStamp.java | 9 +-- .../gameserver/model/actor/Attackable.java | 7 +- .../gameserver/model/actor/Creature.java | 7 +- .../l2jmobius/gameserver/model/actor/Npc.java | 3 +- .../gameserver/model/actor/Player.java | 61 +++++++------- .../model/actor/instance/Block.java | 3 +- .../model/actor/instance/VillageMaster.java | 5 +- .../model/actor/stat/PlayerStat.java | 3 +- .../tasks/attackable/CommandChannelTimer.java | 3 +- .../tasks/player/IllegalPlayerActionTask.java | 5 +- .../gameserver/model/buylist/Product.java | 5 +- .../l2jmobius/gameserver/model/clan/Clan.java | 25 +++--- .../gameserver/model/clan/ClanWar.java | 19 +++-- .../model/holders/TrainingHolder.java | 3 +- .../model/instancezone/Instance.java | 9 +-- .../model/instancezone/InstanceTemplate.java | 7 +- .../conditions/ConditionReenter.java | 3 +- .../gameserver/model/item/instance/Item.java | 11 ++- .../model/itemauction/ItemAuction.java | 9 +-- .../itemauction/ItemAuctionInstance.java | 31 ++++--- .../model/olympiad/AbstractOlympiadGame.java | 3 +- .../gameserver/model/olympiad/Hero.java | 7 +- .../model/olympiad/OlympiadGameNormal.java | 3 +- .../model/punishment/PunishmentTask.java | 7 +- .../gameserver/model/quest/LongTimeEvent.java | 7 +- .../gameserver/model/quest/QuestState.java | 3 +- .../model/residences/AbstractResidence.java | 3 +- .../gameserver/model/residences/ClanHall.java | 7 +- .../model/residences/ClanHallAuction.java | 3 +- .../model/residences/ResidenceFunction.java | 7 +- .../gameserver/model/shuttle/ShuttleStop.java | 9 +-- .../gameserver/model/siege/Castle.java | 5 +- .../gameserver/model/siege/Fort.java | 13 ++- .../gameserver/model/siege/Siege.java | 5 +- .../model/zone/type/NoRestartZone.java | 3 +- .../gameserver/network/GameClient.java | 3 +- .../network/clientpackets/AllyDismiss.java | 3 +- .../network/clientpackets/AllyLeave.java | 3 +- .../network/clientpackets/EnterWorld.java | 3 +- .../clientpackets/MoveBackwardToLocation.java | 3 +- .../RequestExSetPledgeCrestLarge.java | 3 +- .../clientpackets/RequestJoinSiege.java | 3 +- .../RequestMoveToLocationInVehicle.java | 3 +- .../RequestOustPledgeMember.java | 5 +- .../RequestPetitionFeedback.java | 3 +- ...questPledgeSignInForOpenJoiningMethod.java | 7 +- .../RequestPledgeWaitingUserAccept.java | 3 +- .../clientpackets/RequestSetPledgeCrest.java | 3 +- .../clientpackets/RequestStartPledgeWar.java | 3 +- .../RequestWithdrawalPledge.java | 3 +- .../network/clientpackets/UseItem.java | 3 +- .../appearance/RequestShapeShiftingItem.java | 3 +- .../enchant/RequestEnchantItem.java | 3 +- .../RequestExAddEnchantScrollItem.java | 3 +- .../RequestExTryToPutEnchantSupportItem.java | 3 +- .../RequestExTryToPutEnchantTargetItem.java | 3 +- .../huntingzones/ExTimedHuntingZoneEnter.java | 3 +- .../mentoring/ConfirmMenteeAdd.java | 4 +- .../clientpackets/pet/ExPetEquipItem.java | 3 +- .../RequestExPledgeEnemyRegister.java | 3 +- .../RequestExPledgeDonationInfo.java | 3 +- .../primeshop/RequestBRBuyProduct.java | 3 +- .../primeshop/RequestBRPresentBuyProduct.java | 3 +- .../teleports/ExTeleportToRaidPosition.java | 5 +- .../training/NotifyTrainingRoomEnd.java | 5 +- .../loginserverpackets/game/TempBan.java | 3 +- .../serverpackets/CharSelectionInfo.java | 5 +- .../serverpackets/ExInzoneWaiting.java | 3 +- .../ExListPartyMatchingWaitingRoom.java | 3 +- .../serverpackets/ExPartyRoomMember.java | 3 +- .../serverpackets/ExShowReceivedPostList.java | 3 +- .../serverpackets/ExShowSentPostList.java | 3 +- .../network/serverpackets/SiegeInfo.java | 3 +- .../network/serverpackets/SkillCoolTime.java | 3 +- .../ExOneDayReceiveRewardList.java | 7 +- .../RequestExRemoveEnchantSupportItem.java | 3 +- .../friend/ExFriendDetailInfo.java | 3 +- .../huntingzones/TimedHuntingZoneEnter.java | 3 +- .../huntingzones/TimedHuntingZoneList.java | 3 +- .../gameserver/scripting/ManagedScript.java | 3 +- .../taskmanager/AttackStanceTaskManager.java | 5 +- .../taskmanager/BuyListTaskManager.java | 3 +- .../taskmanager/DecayTaskManager.java | 9 +-- .../taskmanager/GameTimeTaskManager.java | 7 +- .../ItemAppearanceTaskManager.java | 3 +- .../taskmanager/ItemLifeTimeTaskManager.java | 3 +- .../taskmanager/ItemManaTaskManager.java | 5 +- .../ItemsAutoDestroyTaskManager.java | 5 +- .../MessageDeletionTaskManager.java | 3 +- .../PlayerAutoSaveTaskManager.java | 5 +- .../taskmanager/PvpFlagTaskManager.java | 3 +- .../RandomAnimationTaskManager.java | 5 +- .../taskmanager/RespawnTaskManager.java | 3 +- .../gameserver/taskmanager/TaskManager.java | 7 +- .../l2jmobius/gameserver/ui/SystemPanel.java | 5 +- .../gameserver/util/FloodProtectorAction.java | 5 +- .../gameserver/util/OfflineTradeUtil.java | 3 +- .../loginserver/FloodProtectedListener.java | 9 +-- .../loginserver/LoginController.java | 13 ++- .../loginserver/network/LoginClient.java | 5 +- 4460 files changed, 10360 insertions(+), 17003 deletions(-) delete mode 100644 L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Chronos.java delete mode 100644 L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/commons/util/Chronos.java delete mode 100644 L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/util/Chronos.java diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index e2710f92ef..1879ece1c7 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -517,7 +516,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader final GlobalVariablesManager vars = GlobalVariablesManager.getInstance(); final long var = vars.getLong("FourSepulchers" + npcId, 0) + (TIME_ATTACK * 60 * 1000); - if (var > Chronos.currentTimeMillis()) + if (var > System.currentTimeMillis()) { showHtmlFile(player, npcId + "-NE.html", npc, null); return; @@ -582,7 +581,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader ThreadPool.schedule(() -> ZoneManager.getInstance().getZoneById(MANAGER_ZONES.get(npcId)).oustAllPlayers(), TIME_ATTACK * 60 * 1000); // Save attack time - vars.set("FourSepulchers" + npcId, Chronos.currentTimeMillis()); + vars.set("FourSepulchers" + npcId, System.currentTimeMillis()); // Init progress STORED_PROGRESS.put(sepulcherId, 1); // start from 1 // Start diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index e9972e869c..89bccaaa2e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -122,7 +121,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -140,7 +139,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index c1d1ccd5b4..8c0c562d71 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -345,7 +344,7 @@ public class Anakim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_anakim", time, null, null); @@ -373,7 +372,7 @@ public class Anakim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -550,7 +549,7 @@ public class Anakim extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC)) @@ -578,7 +577,7 @@ public class Anakim extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid())// Anakim and minions { // Anti BUGGERS @@ -614,7 +613,7 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); @@ -686,7 +685,7 @@ public class Anakim extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java index 82576981ef..357351f632 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index d93a07e3b1..c4843151a3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -92,7 +91,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 7fa9f125f9..a07501ed22 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -296,7 +295,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -689,7 +688,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index d12d95df85..cabf3daedc 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -371,7 +370,7 @@ public class Lilith extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lilith", time, null, null); @@ -399,7 +398,7 @@ public class Lilith extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -576,7 +575,7 @@ public class Lilith extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC)) @@ -594,7 +593,7 @@ public class Lilith extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid()) // Lilith and minions { // Anti BUGGERS @@ -630,7 +629,7 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); @@ -702,7 +701,7 @@ public class Lilith extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } @Override diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 627cc875eb..0b685d633b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 2dd0d3a589..b1bbe24b1a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index fbb84a2ef0..52ba16f303 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append(""); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 619cf456a4..77ea78e8e3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,7 +19,6 @@ 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 +110,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(), Chronos.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.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 +202,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index e2d12df782..3521eaff4c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -136,7 +136,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 3db8b9e550..a8f534ca97 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 9f5b8d48ab..b45e872a60 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index f76eeff808..b71176a555 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 5a747fd4e4..dd6b8696a7 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 49d7d4561d..e218e47e68 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index a87b60a731..aec506035a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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; @@ -119,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 24e4edf9b8..3f078ca3f0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 18cc94f8f2..570702617d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 2081ecd541..344ed52b6f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -89,7 +88,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index 85f7e7861d..7041a462b2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -16,7 +16,6 @@ */ package quests.Q00307_ControlDeviceOfTheGiants; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -102,7 +101,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest { return "32711-09.html"; } - if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - Chronos.currentTimeMillis()) > 0) + if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - System.currentTimeMillis()) > 0) { return "32711-09a.html"; } @@ -169,7 +168,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest qst.setCond(2, true); } } - GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(Chronos.currentTimeMillis() + RESPAWN_DELAY)); + GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(System.currentTimeMillis() + RESPAWN_DELAY)); } break; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java index a3801f6d45..8779566eea 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -179,7 +178,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -455,7 +454,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java index 71ad2e4de6..b9b6c1d758 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java index 9d0041872c..d130fd408b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index d7d900954c..82a4fb8607 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -171,7 +170,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -343,7 +342,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ce0a18fa16..ec688498b4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.World; @@ -60,7 +59,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -93,7 +92,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 7659ca0248..af7aa3d726 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java index 48c6ce61eb..72b752f321 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.item.ItemTemplate; @@ -145,14 +144,14 @@ public class ItemInfo } _option = item.getEnchantOptions(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java index c282592213..42dc5dea48 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -221,7 +220,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -230,7 +229,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5c05bf1f52..98c87554bf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java index 13275178e3..ab10923a72 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java index 36c032dff8..d0c97e2b49 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -47,7 +47,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2879,7 +2878,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3944,22 +3943,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5305,7 +5304,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5338,11 +5337,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6218,7 +6217,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6463,7 +6462,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6588,12 +6587,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6652,7 +6651,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7172,7 +7171,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7257,7 +7256,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7372,7 +7371,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7693,7 +7692,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7755,7 +7754,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7830,7 +7829,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7953,7 +7952,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8044,7 +8043,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12498,7 +12497,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12739,7 +12738,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12791,7 +12790,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12812,7 +12811,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12821,7 +12820,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13179,7 +13178,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5dc6f349b1..ed34c416a3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -22,7 +22,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.AcquireSkillType; @@ -340,13 +339,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java index 7b80af578c..54b4c6492e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -505,7 +504,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -545,7 +544,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1083,12 +1082,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2205,7 +2204,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2217,7 +2216,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2266,7 +2265,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if (leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN) { @@ -2305,7 +2304,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2399,12 +2398,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2456,7 +2455,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2482,7 +2481,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index c644a4b44f..01144e8b71 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java index f58ca404fb..25760ef2c3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -195,7 +194,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -218,7 +217,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1516,7 +1515,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1789,7 +1788,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2163,7 +2162,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 77a0e89162..567c99b70f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index aefc38f568..f52a943d3f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 1646a08d02..fd39cd6df6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 5c9e03dce5..44f5741657 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -547,7 +546,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java index 30a0c5b33b..eb182629d0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java index 010904dcf1..059f4bf673 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4468d9cfa1..5e60a4b604 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -528,7 +527,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 6547ad9bfe..473a5ba5ef 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 7973ca5674..b33fdf644a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index f2f60163d9..639e1bcdf8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index c82873c2f2..01a48d82d8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -260,7 +259,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 7e4acd33fb..063dee5d6f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -165,7 +164,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -254,7 +253,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index b81b25c3d7..d81f6868b3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -50,7 +49,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index fd7085a047..004287a87e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java index 90ca7077ee..2ff46a5410 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.loginserver.GameServerTable; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; import org.l2jmobius.loginserver.network.LoginClient; @@ -167,7 +166,7 @@ public class ServerList implements IOutgoingPacket packet.writeC(_charsToDelete.get(servId).length); for (long deleteTime : _charsToDelete.get(servId)) { - packet.writeD((int) ((deleteTime - Chronos.currentTimeMillis()) / 1000)); + packet.writeD((int) ((deleteTime - System.currentTimeMillis()) / 1000)); } } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index e2710f92ef..1879ece1c7 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -517,7 +516,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader final GlobalVariablesManager vars = GlobalVariablesManager.getInstance(); final long var = vars.getLong("FourSepulchers" + npcId, 0) + (TIME_ATTACK * 60 * 1000); - if (var > Chronos.currentTimeMillis()) + if (var > System.currentTimeMillis()) { showHtmlFile(player, npcId + "-NE.html", npc, null); return; @@ -582,7 +581,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader ThreadPool.schedule(() -> ZoneManager.getInstance().getZoneById(MANAGER_ZONES.get(npcId)).oustAllPlayers(), TIME_ATTACK * 60 * 1000); // Save attack time - vars.set("FourSepulchers" + npcId, Chronos.currentTimeMillis()); + vars.set("FourSepulchers" + npcId, System.currentTimeMillis()); // Init progress STORED_PROGRESS.put(sepulcherId, 1); // start from 1 // Start diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index e9972e869c..89bccaaa2e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -122,7 +121,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -140,7 +139,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index c1d1ccd5b4..8c0c562d71 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -345,7 +344,7 @@ public class Anakim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_anakim", time, null, null); @@ -373,7 +372,7 @@ public class Anakim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -550,7 +549,7 @@ public class Anakim extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC)) @@ -578,7 +577,7 @@ public class Anakim extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid())// Anakim and minions { // Anti BUGGERS @@ -614,7 +613,7 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); @@ -686,7 +685,7 @@ public class Anakim extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java index 82576981ef..357351f632 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index d93a07e3b1..c4843151a3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -92,7 +91,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 7fa9f125f9..a07501ed22 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -296,7 +295,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -689,7 +688,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index d12d95df85..cabf3daedc 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -371,7 +370,7 @@ public class Lilith extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lilith", time, null, null); @@ -399,7 +398,7 @@ public class Lilith extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -576,7 +575,7 @@ public class Lilith extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC)) @@ -594,7 +593,7 @@ public class Lilith extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid()) // Lilith and minions { // Anti BUGGERS @@ -630,7 +629,7 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); @@ -702,7 +701,7 @@ public class Lilith extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } @Override diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 627cc875eb..0b685d633b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 2dd0d3a589..b1bbe24b1a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 1021a61e7a..f1c43a8aaa 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 619cf456a4..77ea78e8e3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,7 +19,6 @@ 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 +110,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(), Chronos.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.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 +202,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index e2d12df782..3521eaff4c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -136,7 +136,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 3db8b9e550..a8f534ca97 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 9f5b8d48ab..b45e872a60 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index f76eeff808..b71176a555 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 5a747fd4e4..dd6b8696a7 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 49d7d4561d..e218e47e68 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index a87b60a731..aec506035a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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; @@ -119,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_01.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index aaf979da12..4300a59788 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -176,7 +175,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index c86890807d..b2af2edcfd 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c85c232792..d610a43967 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 18cc94f8f2..570702617d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 2081ecd541..344ed52b6f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -89,7 +88,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index 85f7e7861d..7041a462b2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -16,7 +16,6 @@ */ package quests.Q00307_ControlDeviceOfTheGiants; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -102,7 +101,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest { return "32711-09.html"; } - if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - Chronos.currentTimeMillis()) > 0) + if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - System.currentTimeMillis()) > 0) { return "32711-09a.html"; } @@ -169,7 +168,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest qst.setCond(2, true); } } - GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(Chronos.currentTimeMillis() + RESPAWN_DELAY)); + GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(System.currentTimeMillis() + RESPAWN_DELAY)); } break; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/GameServer.java index 70a3b3cb4f..34af1ca9f7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -183,7 +182,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -463,7 +462,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java index 71ad2e4de6..b9b6c1d758 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java index 9d0041872c..d130fd408b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index d7d900954c..82a4fb8607 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -171,7 +170,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -343,7 +342,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7098b58418..2ef20a2148 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -102,7 +101,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); storePlayerEntry(entry); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 6779359988..d509d70548 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -62,7 +61,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -95,7 +94,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 7659ca0248..af7aa3d726 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java index b8b74cb986..942669b9d5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -217,7 +216,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -226,7 +225,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5c05bf1f52..98c87554bf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java index 98a11e46e8..e38514cadb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java index 4924d8751c..eefd4dba7d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -47,7 +47,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2881,7 +2880,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3946,22 +3945,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5307,7 +5306,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5340,11 +5339,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6220,7 +6219,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6465,7 +6464,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6591,12 +6590,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6655,7 +6654,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7175,7 +7174,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7260,7 +7259,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7375,7 +7374,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7696,7 +7695,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7758,7 +7757,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7833,7 +7832,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7956,7 +7955,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8047,7 +8046,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12501,7 +12500,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12742,7 +12741,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12794,7 +12793,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12815,7 +12814,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12824,7 +12823,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13182,7 +13181,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14094,7 +14093,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5dc6f349b1..ed34c416a3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -22,7 +22,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.AcquireSkillType; @@ -340,13 +339,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java index 5065bc6d14..8f25273f3b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2206,7 +2205,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2218,7 +2217,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2267,7 +2266,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if (leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN) { @@ -2306,7 +2305,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2400,12 +2399,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2457,7 +2456,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2483,7 +2482,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index c644a4b44f..01144e8b71 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 16c85f8ecf..089006ecdb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -199,7 +198,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -222,7 +221,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1521,7 +1520,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1800,7 +1799,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2420,7 +2419,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 77a0e89162..567c99b70f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index bb38fad825..fe5de7330c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.enums.QuestSound; @@ -88,7 +87,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 1646a08d02..fd39cd6df6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 735d6f7112..0d1ec3a310 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -549,7 +548,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java index 30a0c5b33b..eb182629d0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java index b79e46b455..d6f56d94aa 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 73fecb4326..84975b8913 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -533,7 +532,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index d0df287db5..2fe1117405 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 7973ca5674..b33fdf644a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index f2f60163d9..639e1bcdf8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index c82873c2f2..01a48d82d8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -260,7 +259,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index ea750c697c..bae53f4051 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -165,7 +164,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -253,7 +252,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index b81b25c3d7..d81f6868b3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -50,7 +49,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 9cfbd781a6..138d7d4898 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index e2710f92ef..1879ece1c7 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -517,7 +516,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader final GlobalVariablesManager vars = GlobalVariablesManager.getInstance(); final long var = vars.getLong("FourSepulchers" + npcId, 0) + (TIME_ATTACK * 60 * 1000); - if (var > Chronos.currentTimeMillis()) + if (var > System.currentTimeMillis()) { showHtmlFile(player, npcId + "-NE.html", npc, null); return; @@ -582,7 +581,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader ThreadPool.schedule(() -> ZoneManager.getInstance().getZoneById(MANAGER_ZONES.get(npcId)).oustAllPlayers(), TIME_ATTACK * 60 * 1000); // Save attack time - vars.set("FourSepulchers" + npcId, Chronos.currentTimeMillis()); + vars.set("FourSepulchers" + npcId, System.currentTimeMillis()); // Init progress STORED_PROGRESS.put(sepulcherId, 1); // start from 1 // Start diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index e9972e869c..89bccaaa2e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -122,7 +121,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -140,7 +139,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index c1d1ccd5b4..8c0c562d71 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -345,7 +344,7 @@ public class Anakim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_anakim", time, null, null); @@ -373,7 +372,7 @@ public class Anakim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -550,7 +549,7 @@ public class Anakim extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC)) @@ -578,7 +577,7 @@ public class Anakim extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid())// Anakim and minions { // Anti BUGGERS @@ -614,7 +613,7 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); @@ -686,7 +685,7 @@ public class Anakim extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java index 82576981ef..357351f632 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index d93a07e3b1..c4843151a3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -92,7 +91,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 7fa9f125f9..a07501ed22 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -296,7 +295,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -689,7 +688,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index d12d95df85..cabf3daedc 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -371,7 +370,7 @@ public class Lilith extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lilith", time, null, null); @@ -399,7 +398,7 @@ public class Lilith extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -576,7 +575,7 @@ public class Lilith extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC)) @@ -594,7 +593,7 @@ public class Lilith extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid()) // Lilith and minions { // Anti BUGGERS @@ -630,7 +629,7 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); @@ -702,7 +701,7 @@ public class Lilith extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } @Override diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 627cc875eb..0b685d633b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index 8ee1bc2c4b..3c48b84794 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -137,7 +136,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -167,7 +166,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -186,7 +185,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -300,7 +299,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -402,7 +401,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -413,12 +412,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -540,7 +539,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -568,13 +567,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 2dd0d3a589..b1bbe24b1a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 1021a61e7a..f1c43a8aaa 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 619cf456a4..77ea78e8e3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,7 +19,6 @@ 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 +110,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(), Chronos.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.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 +202,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index e2d12df782..3521eaff4c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -136,7 +136,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 3db8b9e550..a8f534ca97 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 9f5b8d48ab..b45e872a60 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index f76eeff808..b71176a555 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 5a747fd4e4..dd6b8696a7 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 49d7d4561d..e218e47e68 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index a87b60a731..aec506035a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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; @@ -119,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_02.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index aaf979da12..4300a59788 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -176,7 +175,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index c86890807d..b2af2edcfd 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c85c232792..d610a43967 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 18cc94f8f2..570702617d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 2081ecd541..344ed52b6f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -89,7 +88,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/GameServer.java index 70a3b3cb4f..34af1ca9f7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -183,7 +182,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -463,7 +462,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java index 71ad2e4de6..b9b6c1d758 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java index 9d0041872c..d130fd408b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ff17f694f3..ed889ce365 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7098b58418..2ef20a2148 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -102,7 +101,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); storePlayerEntry(entry); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 6d17d8858c..5525505b33 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -73,7 +72,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -106,7 +105,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 7659ca0248..af7aa3d726 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java index b8b74cb986..942669b9d5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -217,7 +216,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -226,7 +225,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5c05bf1f52..98c87554bf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java index 98a11e46e8..e38514cadb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java index 4178c995e8..2c3ab0736b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -47,7 +47,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2883,7 +2882,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3948,22 +3947,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5309,7 +5308,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5342,11 +5341,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6222,7 +6221,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6467,7 +6466,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6593,12 +6592,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6657,7 +6656,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7177,7 +7176,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7262,7 +7261,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7377,7 +7376,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7698,7 +7697,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7760,7 +7759,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7835,7 +7834,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7958,7 +7957,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8049,7 +8048,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12503,7 +12502,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12744,7 +12743,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12796,7 +12795,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12817,7 +12816,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12826,7 +12825,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13185,7 +13184,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14143,7 +14142,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5dc6f349b1..ed34c416a3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -22,7 +22,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.AcquireSkillType; @@ -340,13 +339,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java index 5065bc6d14..8f25273f3b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2206,7 +2205,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2218,7 +2217,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2267,7 +2266,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if (leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN) { @@ -2306,7 +2305,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2400,12 +2399,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2457,7 +2456,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2483,7 +2482,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index c644a4b44f..01144e8b71 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 16c85f8ecf..089006ecdb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -199,7 +198,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -222,7 +221,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1521,7 +1520,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1800,7 +1799,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2420,7 +2419,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 77a0e89162..567c99b70f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index bb38fad825..fe5de7330c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.enums.QuestSound; @@ -88,7 +87,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 1646a08d02..fd39cd6df6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 735d6f7112..0d1ec3a310 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -549,7 +548,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java index 30a0c5b33b..eb182629d0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java index b79e46b455..d6f56d94aa 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 73fecb4326..84975b8913 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -533,7 +532,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index d0df287db5..2fe1117405 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 7973ca5674..b33fdf644a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 4ac3a80bc1..9963bcec93 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index f2f60163d9..639e1bcdf8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index c82873c2f2..01a48d82d8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -260,7 +259,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index ea750c697c..bae53f4051 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -165,7 +164,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -253,7 +252,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index b81b25c3d7..d81f6868b3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -50,7 +49,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index e2710f92ef..1879ece1c7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -517,7 +516,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader final GlobalVariablesManager vars = GlobalVariablesManager.getInstance(); final long var = vars.getLong("FourSepulchers" + npcId, 0) + (TIME_ATTACK * 60 * 1000); - if (var > Chronos.currentTimeMillis()) + if (var > System.currentTimeMillis()) { showHtmlFile(player, npcId + "-NE.html", npc, null); return; @@ -582,7 +581,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader ThreadPool.schedule(() -> ZoneManager.getInstance().getZoneById(MANAGER_ZONES.get(npcId)).oustAllPlayers(), TIME_ATTACK * 60 * 1000); // Save attack time - vars.set("FourSepulchers" + npcId, Chronos.currentTimeMillis()); + vars.set("FourSepulchers" + npcId, System.currentTimeMillis()); // Init progress STORED_PROGRESS.put(sepulcherId, 1); // start from 1 // Start diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index 74c9a62e5e..e4edb350d4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -124,7 +123,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -150,7 +149,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index c1d1ccd5b4..8c0c562d71 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -345,7 +344,7 @@ public class Anakim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_anakim", time, null, null); @@ -373,7 +372,7 @@ public class Anakim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -550,7 +549,7 @@ public class Anakim extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC)) @@ -578,7 +577,7 @@ public class Anakim extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid())// Anakim and minions { // Anti BUGGERS @@ -614,7 +613,7 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); @@ -686,7 +685,7 @@ public class Anakim extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java index f7405ede45..7a7b195897 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index d93a07e3b1..c4843151a3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -92,7 +91,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 7fa9f125f9..a07501ed22 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -296,7 +295,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -689,7 +688,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index d12d95df85..cabf3daedc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -371,7 +370,7 @@ public class Lilith extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lilith", time, null, null); @@ -399,7 +398,7 @@ public class Lilith extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -576,7 +575,7 @@ public class Lilith extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC)) @@ -594,7 +593,7 @@ public class Lilith extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid()) // Lilith and minions { // Anti BUGGERS @@ -630,7 +629,7 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); @@ -702,7 +701,7 @@ public class Lilith extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } @Override diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 627cc875eb..0b685d633b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index 8ee1bc2c4b..3c48b84794 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -137,7 +136,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -167,7 +166,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -186,7 +185,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -300,7 +299,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -402,7 +401,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -413,12 +412,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -540,7 +539,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -568,13 +567,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 2dd0d3a589..b1bbe24b1a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index cfba824b54..7ecb6353f0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 619cf456a4..77ea78e8e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,7 +19,6 @@ 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 +110,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(), Chronos.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.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 +202,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index e2d12df782..3521eaff4c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -136,7 +136,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 3db8b9e550..a8f534ca97 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 9f5b8d48ab..b45e872a60 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java index 913d86302a..8213b7f1e6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_04.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index f76eeff808..b71176a555 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 5a747fd4e4..dd6b8696a7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 49d7d4561d..e218e47e68 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index a87b60a731..aec506035a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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; @@ -119,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_03.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index aaf979da12..4300a59788 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -176,7 +175,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index c86890807d..b2af2edcfd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c85c232792..d610a43967 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 18cc94f8f2..570702617d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 2081ecd541..344ed52b6f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -89,7 +88,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java index 2dd317b62d..8ced197530 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -183,7 +182,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -463,7 +462,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java index 71ad2e4de6..b9b6c1d758 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java index 706a49f876..c2f2d6ba65 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 3ce3716f0e..0bd0848a08 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 564d275801..53f4033548 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -187,7 +186,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 6d17d8858c..5525505b33 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -73,7 +72,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -106,7 +105,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 7659ca0248..af7aa3d726 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java index b8b74cb986..942669b9d5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -217,7 +216,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -226,7 +225,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5c05bf1f52..98c87554bf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java index 98a11e46e8..e38514cadb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java index 0a84a93ed4..cc0c6f790e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -46,7 +46,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2879,7 +2878,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3944,22 +3943,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5305,7 +5304,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5338,11 +5337,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6217,7 +6216,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6462,7 +6461,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6588,12 +6587,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6652,7 +6651,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7172,7 +7171,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7257,7 +7256,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7372,7 +7371,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7693,7 +7692,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7755,7 +7754,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7830,7 +7829,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7953,7 +7952,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8044,7 +8043,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12484,7 +12483,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12724,7 +12723,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12776,7 +12775,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12797,7 +12796,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12806,7 +12805,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13165,7 +13164,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14160,7 +14159,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5dc6f349b1..ed34c416a3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -22,7 +22,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.AcquireSkillType; @@ -340,13 +339,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java index 5065bc6d14..8f25273f3b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2206,7 +2205,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2218,7 +2217,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2267,7 +2266,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if (leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN) { @@ -2306,7 +2305,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2400,12 +2399,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2457,7 +2456,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2483,7 +2482,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index c644a4b44f..01144e8b71 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 5bbc422ad3..469bb55c42 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -199,7 +198,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -222,7 +221,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1521,7 +1520,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1800,7 +1799,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2454,7 +2453,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index d5cd3dcb89..66feeee146 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.enums.QuestSound; @@ -88,7 +87,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 1646a08d02..fd39cd6df6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 8b717f05e3..afa106ab93 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -547,7 +546,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java index 30a0c5b33b..eb182629d0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java index b79e46b455..d6f56d94aa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0497726e97..571a24d7b0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -533,7 +532,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 1384ed3e7e..b8f37f22bc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 7973ca5674..b33fdf644a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 4ac3a80bc1..9963bcec93 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index f2f60163d9..639e1bcdf8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index c82873c2f2..01a48d82d8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -260,7 +259,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 84daad43be..712cd88b49 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -165,7 +164,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -253,7 +252,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index f11ae5f478..5dac295e4f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index e2710f92ef..1879ece1c7 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -517,7 +516,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader final GlobalVariablesManager vars = GlobalVariablesManager.getInstance(); final long var = vars.getLong("FourSepulchers" + npcId, 0) + (TIME_ATTACK * 60 * 1000); - if (var > Chronos.currentTimeMillis()) + if (var > System.currentTimeMillis()) { showHtmlFile(player, npcId + "-NE.html", npc, null); return; @@ -582,7 +581,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader ThreadPool.schedule(() -> ZoneManager.getInstance().getZoneById(MANAGER_ZONES.get(npcId)).oustAllPlayers(), TIME_ATTACK * 60 * 1000); // Save attack time - vars.set("FourSepulchers" + npcId, Chronos.currentTimeMillis()); + vars.set("FourSepulchers" + npcId, System.currentTimeMillis()); // Init progress STORED_PROGRESS.put(sepulcherId, 1); // start from 1 // Start diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index 74c9a62e5e..e4edb350d4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -124,7 +123,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -150,7 +149,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index c1d1ccd5b4..8c0c562d71 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -345,7 +344,7 @@ public class Anakim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_anakim", time, null, null); @@ -373,7 +372,7 @@ public class Anakim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -550,7 +549,7 @@ public class Anakim extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC)) @@ -578,7 +577,7 @@ public class Anakim extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid())// Anakim and minions { // Anti BUGGERS @@ -614,7 +613,7 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); @@ -686,7 +685,7 @@ public class Anakim extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java index f7405ede45..7a7b195897 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index d93a07e3b1..c4843151a3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -92,7 +91,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 7fa9f125f9..a07501ed22 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -296,7 +295,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -689,7 +688,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index d12d95df85..cabf3daedc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -371,7 +370,7 @@ public class Lilith extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lilith", time, null, null); @@ -399,7 +398,7 @@ public class Lilith extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -576,7 +575,7 @@ public class Lilith extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC)) @@ -594,7 +593,7 @@ public class Lilith extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid()) // Lilith and minions { // Anti BUGGERS @@ -630,7 +629,7 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); @@ -702,7 +701,7 @@ public class Lilith extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } @Override diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 627cc875eb..0b685d633b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index b41ffbd3ec..f7223ad2a4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -137,7 +136,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -167,7 +166,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -186,7 +185,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -300,7 +299,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -402,7 +401,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -413,12 +412,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -540,7 +539,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -568,13 +567,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 2dd0d3a589..b1bbe24b1a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index b5c36ffcce..e8d1c84950 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 93f031fc84..5d42367676 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,7 +19,6 @@ 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 +110,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(), Chronos.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.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 +202,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index a022d1f7a0..ea601d1f9b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -134,7 +134,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index a9dded7b28..82f5cdc261 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 546cf605d1..f4eab89c4e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java index 55091f1e19..ed84918716 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_05.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index dace0a53d8..2f60479b40 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index c81b709241..fcef497220 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 49d7d4561d..e218e47e68 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index a87b60a731..aec506035a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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; @@ -119,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_04.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index aaf979da12..4300a59788 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -176,7 +175,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index ffaf36617b..f3552809f8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c85c232792..d610a43967 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 18cc94f8f2..570702617d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 2081ecd541..344ed52b6f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -89,7 +88,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java index 35133e4fbe..60aafee877 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -185,7 +184,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -467,7 +466,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java index 5ecbe4bc69..8b6d13b189 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java index 2d88ca6e61..e1ceca4ca7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MIN_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 3ce3716f0e..0bd0848a08 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 564d275801..53f4033548 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -187,7 +186,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7b8cb97fa5..839ac176a7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.enums.SpecialItemType; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -126,7 +125,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer { entry.setStatus(DailyMissionStatus.COMPLETED); } - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 2ce3e815cc..5f3b8df714 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MIN_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 8248c1c897..30e250d51a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -71,7 +70,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -104,7 +103,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 8c0e8600ac..5e348183a3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 79f548e3c6..e9cd8694f5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4301675a1c..fdf00447d4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -216,7 +215,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -225,7 +224,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index e46e3066e3..ceab97b75a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java index 98a11e46e8..e38514cadb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java index 41a7e16928..3866e2e3aa 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -46,7 +46,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2908,7 +2907,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3959,22 +3958,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5322,7 +5321,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5355,11 +5354,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6234,7 +6233,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6479,7 +6478,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6605,12 +6604,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6669,7 +6668,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7188,7 +7187,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7273,7 +7272,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7388,7 +7387,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7709,7 +7708,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7771,7 +7770,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7846,7 +7845,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7969,7 +7968,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8060,7 +8059,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12510,7 +12509,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12750,7 +12749,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12802,7 +12801,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12823,7 +12822,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12832,7 +12831,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13191,7 +13190,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14156,7 +14155,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index c524e8d97a..5bd6d12029 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -21,7 +21,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -282,13 +281,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java index 4c81bef118..84182fd985 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -516,7 +515,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -555,7 +554,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1005,12 +1004,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2057,7 +2056,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2069,7 +2068,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2111,7 +2110,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2147,7 +2146,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2241,12 +2240,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2298,7 +2297,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2324,7 +2323,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2709,7 +2708,7 @@ public class Clan implements IIdentifiable, INamable public void addMasterySkill(int id) { - getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, Chronos.currentTimeMillis() + 1296000000); + getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, System.currentTimeMillis() + 1296000000); final ScheduledFuture task = ThreadPool.schedule(() -> removeMasterySkill(id), 1296000000); // 1296000000 = 15 days masterySkillTasks.add(task); addNewSkill(SkillData.getInstance().getSkill(id, 1)); @@ -2728,7 +2727,7 @@ public class Clan implements IIdentifiable, INamable { return -1; } - return (int) (endTime - Chronos.currentTimeMillis()); + return (int) (endTime - System.currentTimeMillis()); } public void setDevelopmentPoints(int count) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 99ae98fd85..ea66c21c6a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 9bd79e394f..140908d8c1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bda337fdb1..c0a3f3e48a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -206,7 +205,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -229,7 +228,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1582,7 +1581,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1861,7 +1860,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2518,7 +2517,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index be37b10d4f..a5644a0c90 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index d5cd3dcb89..66feeee146 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.enums.QuestSound; @@ -88,7 +87,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 1646a08d02..fd39cd6df6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 8b717f05e3..afa106ab93 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -547,7 +546,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java index 27c7525c68..d9a48df4f0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java index dba91db269..540a78e9a3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 7a024171a6..d6250c86be 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -534,7 +533,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HR); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 5655808a8d..e7f635a1db 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 502e2a0f00..af65e15cae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 7973ca5674..b33fdf644a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index dd4dc458cd..cd8aa37ebf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISMISSED); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 063447c290..944032499e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanLevelData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 7e97cf22af..b327d72320 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index f2f60163d9..639e1bcdf8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 560580862d..35be5945ff 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 2a7b43934b..7aecc69ad0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -257,7 +256,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 0d44f11c1e..490805ae86 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 9b6f0dcb3f..eb7bb653f0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.instancemanager.PremiumManager; @@ -230,7 +229,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -318,7 +317,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index 35159829b3..8ca61e5e9b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -517,7 +516,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader final GlobalVariablesManager vars = GlobalVariablesManager.getInstance(); final long var = vars.getLong("FourSepulchers" + npcId, 0) + (TIME_ATTACK * 60 * 1000); - if (var > Chronos.currentTimeMillis()) + if (var > System.currentTimeMillis()) { showHtmlFile(player, npcId + "-NE.html", npc, null); return; @@ -582,7 +581,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader ThreadPool.schedule(() -> ZoneManager.getInstance().getZoneById(MANAGER_ZONES.get(npcId)).oustAllPlayers(), TIME_ATTACK * 60 * 1000); // Save attack time - vars.set("FourSepulchers" + npcId, Chronos.currentTimeMillis()); + vars.set("FourSepulchers" + npcId, System.currentTimeMillis()); // Init progress STORED_PROGRESS.put(sepulcherId, 1); // start from 1 // Start diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index 74c9a62e5e..e4edb350d4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -124,7 +123,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -150,7 +149,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index c1d1ccd5b4..8c0c562d71 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -345,7 +344,7 @@ public class Anakim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_anakim", time, null, null); @@ -373,7 +372,7 @@ public class Anakim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -550,7 +549,7 @@ public class Anakim extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC)) @@ -578,7 +577,7 @@ public class Anakim extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid())// Anakim and minions { // Anti BUGGERS @@ -614,7 +613,7 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); @@ -686,7 +685,7 @@ public class Anakim extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java index f7405ede45..7a7b195897 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index d93a07e3b1..c4843151a3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -92,7 +91,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java index cb5c274ba9..00c7e9bea0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -332,7 +331,7 @@ public class EtisVanEtina extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_etina", time, null, null); @@ -360,7 +359,7 @@ public class EtisVanEtina extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE) { @@ -515,7 +514,7 @@ public class EtisVanEtina extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Anti BUGGERS if (!BOSS_ZONE.isInsideZone(attacker)) { @@ -698,7 +697,7 @@ public class EtisVanEtina extends AbstractNpcAI _paragon.setInvul(true); BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true))); GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); } } @@ -730,7 +729,7 @@ public class EtisVanEtina extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD); final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ETIS_VAN_ETINA1, info); startQuestTimer("unlock_etina", respawnTime, null, null); startQuestTimer("end_etina", 900000, null, null); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 7fa9f125f9..a07501ed22 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -296,7 +295,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -689,7 +688,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index d12d95df85..cabf3daedc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -371,7 +370,7 @@ public class Lilith extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lilith", time, null, null); @@ -399,7 +398,7 @@ public class Lilith extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -576,7 +575,7 @@ public class Lilith extends AbstractNpcAI } _remnants.clear(); notifyEvent("spawn_remant", null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); } else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC)) @@ -594,7 +593,7 @@ public class Lilith extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid()) // Lilith and minions { // Anti BUGGERS @@ -630,7 +629,7 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); @@ -702,7 +701,7 @@ public class Lilith extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } @Override diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 2fe2f79d46..50a6e42559 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -89,7 +88,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -310,7 +309,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index b41ffbd3ec..f7223ad2a4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -137,7 +136,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -167,7 +166,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -186,7 +185,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -300,7 +299,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -402,7 +401,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -413,12 +412,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -540,7 +539,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -568,13 +567,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 2dd0d3a589..b1bbe24b1a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index b5c36ffcce..e8d1c84950 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 619cf456a4..77ea78e8e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,7 +19,6 @@ 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 +110,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(), Chronos.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.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 +202,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index a022d1f7a0..ea601d1f9b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -134,7 +134,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 3db8b9e550..a8f534ca97 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 9f5b8d48ab..b45e872a60 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java index 55091f1e19..ed84918716 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_05.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index f76eeff808..b71176a555 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 0d96e66052..a6666bb367 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 49d7d4561d..e218e47e68 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_05.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index aaf979da12..4300a59788 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -176,7 +175,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 9487ca4098..3d9289edd0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c85c232792..d610a43967 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 18cc94f8f2..570702617d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 2081ecd541..344ed52b6f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -89,7 +88,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java index 35133e4fbe..60aafee877 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -185,7 +184,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -467,7 +466,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java index 71ad2e4de6..b9b6c1d758 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java index 706a49f876..c2f2d6ba65 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 3ce3716f0e..0bd0848a08 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 564d275801..53f4033548 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -187,7 +186,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7b8cb97fa5..839ac176a7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.enums.SpecialItemType; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -126,7 +125,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer { entry.setStatus(DailyMissionStatus.COMPLETED); } - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 8248c1c897..30e250d51a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -71,7 +70,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -104,7 +103,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 8c0e8600ac..5e348183a3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 038c7f8193..1a9cf1dfec 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4301675a1c..fdf00447d4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -216,7 +215,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -225,7 +224,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index e46e3066e3..ceab97b75a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java index 98a11e46e8..e38514cadb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java index de14124ee4..858835e465 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -46,7 +46,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2908,7 +2907,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3959,22 +3958,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5322,7 +5321,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5355,11 +5354,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6234,7 +6233,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6479,7 +6478,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6605,12 +6604,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6669,7 +6668,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7188,7 +7187,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7273,7 +7272,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7388,7 +7387,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7709,7 +7708,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7771,7 +7770,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7846,7 +7845,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7969,7 +7968,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8060,7 +8059,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12513,7 +12512,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12753,7 +12752,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12805,7 +12804,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12826,7 +12825,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12835,7 +12834,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13194,7 +13193,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14159,7 +14158,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index c524e8d97a..5bd6d12029 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -21,7 +21,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -282,13 +281,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java index 4c81bef118..84182fd985 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -516,7 +515,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -555,7 +554,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1005,12 +1004,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2057,7 +2056,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2069,7 +2068,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2111,7 +2110,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2147,7 +2146,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2241,12 +2240,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2298,7 +2297,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2324,7 +2323,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2709,7 +2708,7 @@ public class Clan implements IIdentifiable, INamable public void addMasterySkill(int id) { - getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, Chronos.currentTimeMillis() + 1296000000); + getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, System.currentTimeMillis() + 1296000000); final ScheduledFuture task = ThreadPool.schedule(() -> removeMasterySkill(id), 1296000000); // 1296000000 = 15 days masterySkillTasks.add(task); addNewSkill(SkillData.getInstance().getSkill(id, 1)); @@ -2728,7 +2727,7 @@ public class Clan implements IIdentifiable, INamable { return -1; } - return (int) (endTime - Chronos.currentTimeMillis()); + return (int) (endTime - System.currentTimeMillis()); } public void setDevelopmentPoints(int count) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 4e8db32a55..d035db80b3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bda337fdb1..c0a3f3e48a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -206,7 +205,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -229,7 +228,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1582,7 +1581,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1861,7 +1860,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2518,7 +2517,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index d5cd3dcb89..66feeee146 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.enums.QuestSound; @@ -88,7 +87,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 2eb72eef2a..fd681ab3d4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 8b717f05e3..afa106ab93 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -547,7 +546,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java index 27c7525c68..d9a48df4f0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java index d78aa5ee0a..524d427d9c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index aed8356181..476907b225 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -534,7 +533,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 5655808a8d..e7f635a1db 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 502e2a0f00..af65e15cae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index cbcbb3e785..cb451b1074 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index f8df3d17a5..3b4d20980c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISMISSED); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 063447c290..944032499e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanLevelData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 7e97cf22af..b327d72320 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index f2f60163d9..639e1bcdf8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 560580862d..35be5945ff 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index f417f016e4..344826973a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -266,7 +265,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 815217150e..2022810da2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.instancemanager.PremiumManager; @@ -252,7 +251,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -340,7 +339,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index 35159829b3..8ca61e5e9b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -517,7 +516,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader final GlobalVariablesManager vars = GlobalVariablesManager.getInstance(); final long var = vars.getLong("FourSepulchers" + npcId, 0) + (TIME_ATTACK * 60 * 1000); - if (var > Chronos.currentTimeMillis()) + if (var > System.currentTimeMillis()) { showHtmlFile(player, npcId + "-NE.html", npc, null); return; @@ -582,7 +581,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader ThreadPool.schedule(() -> ZoneManager.getInstance().getZoneById(MANAGER_ZONES.get(npcId)).oustAllPlayers(), TIME_ATTACK * 60 * 1000); // Save attack time - vars.set("FourSepulchers" + npcId, Chronos.currentTimeMillis()); + vars.set("FourSepulchers" + npcId, System.currentTimeMillis()); // Init progress STORED_PROGRESS.put(sepulcherId, 1); // start from 1 // Start diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index 74c9a62e5e..e4edb350d4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -124,7 +123,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -150,7 +149,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 48dfe2211a..0ce3b63fe1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -94,7 +93,7 @@ public class Anakim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_anakim", time, null, null); @@ -128,7 +127,7 @@ public class Anakim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -268,7 +267,7 @@ public class Anakim extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid())// Anakim and minions { // Anti BUGGERS @@ -300,7 +299,7 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); @@ -360,7 +359,7 @@ public class Anakim extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java index f7405ede45..7a7b195897 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index f6b09d6580..6e88c23892 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -92,7 +91,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java index cb5c274ba9..00c7e9bea0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -332,7 +331,7 @@ public class EtisVanEtina extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_etina", time, null, null); @@ -360,7 +359,7 @@ public class EtisVanEtina extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE) { @@ -515,7 +514,7 @@ public class EtisVanEtina extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Anti BUGGERS if (!BOSS_ZONE.isInsideZone(attacker)) { @@ -698,7 +697,7 @@ public class EtisVanEtina extends AbstractNpcAI _paragon.setInvul(true); BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true))); GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); } } @@ -730,7 +729,7 @@ public class EtisVanEtina extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD); final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ETIS_VAN_ETINA1, info); startQuestTimer("unlock_etina", respawnTime, null, null); startQuestTimer("end_etina", 900000, null, null); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java index 281f8bb17e..205fe31ebf 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java @@ -20,7 +20,6 @@ package ai.bosses.Fafurion; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -85,7 +84,7 @@ public class Fafurion extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_fafurion", time, null, null); @@ -450,7 +449,7 @@ public class Fafurion extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD); final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info); startQuestTimer("unlock_fafurion", respawnTime, null, null); if (_stage < 7) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 7fa9f125f9..a07501ed22 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -296,7 +295,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -689,7 +688,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index c1596cfcbf..88c871b9ab 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -93,7 +92,7 @@ public class Lilith extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lilith", time, null, null); @@ -127,7 +126,7 @@ public class Lilith extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -251,7 +250,7 @@ public class Lilith extends AbstractNpcAI // Spawn the rb _lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0); GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); startQuestTimer("end_lilith", 60 * 60000, null, null); // 1h } @@ -261,7 +260,7 @@ public class Lilith extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid()) // Lilith and minions { // Anti BUGGERS @@ -293,7 +292,7 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); @@ -353,7 +352,7 @@ public class Lilith extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } @Override diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 2fe2f79d46..50a6e42559 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -89,7 +88,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -310,7 +309,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index b41ffbd3ec..f7223ad2a4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -137,7 +136,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -167,7 +166,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -186,7 +185,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -300,7 +299,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -402,7 +401,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -413,12 +412,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -540,7 +539,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -568,13 +567,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 2dd0d3a589..b1bbe24b1a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index b5c36ffcce..e8d1c84950 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java index 619cf456a4..77ea78e8e3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java @@ -19,7 +19,6 @@ 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 +110,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(), Chronos.currentTimeMillis(), -1)); + player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.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 +202,7 @@ public class TrainingCamp extends AbstractNpcAI final TrainingHolder holder = player.getTraingCampInfo(); if ((holder != null) && (holder.getObjectId() == player.getObjectId())) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index a022d1f7a0..ea601d1f9b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -134,7 +134,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 3db8b9e550..a8f534ca97 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 9f5b8d48ab..b45e872a60 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java index 55091f1e19..ed84918716 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_06.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index f76eeff808..b71176a555 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 9f53444302..7f885e818d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 49d7d4561d..e218e47e68 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java index b96243b027..4256e9042d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -67,7 +66,7 @@ public class TrainingWithDandy extends LongTimeEvent { npc.setTarget(player); npc.doCast(DANDY_CH.getSkill()); - player.getVariables().set(GIVE_DANDI_BUFF_VAR, Chronos.currentTimeMillis()); + player.getVariables().set(GIVE_DANDI_BUFF_VAR, System.currentTimeMillis()); player.broadcastStatusUpdate(); htmltext = "33894-2.htm"; break; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_05.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index 3eeb11640c..19c29e7cdc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -176,7 +175,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 9487ca4098..3d9289edd0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java index 2730786b66..e9b9b4b62e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index f7df59d59b..845b1ac64f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 105ceaf280..94569f9c21 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -89,7 +88,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java index 6bd76af43e..6213ad8953 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -186,7 +185,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -469,7 +468,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java index 71ad2e4de6..b9b6c1d758 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java index 706a49f876..c2f2d6ba65 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 3ce3716f0e..0bd0848a08 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 564d275801..53f4033548 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -187,7 +186,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7b8cb97fa5..839ac176a7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.enums.SpecialItemType; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -126,7 +125,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer { entry.setStatus(DailyMissionStatus.COMPLETED); } - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 8248c1c897..30e250d51a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -71,7 +70,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -104,7 +103,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 8c0e8600ac..5e348183a3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 038c7f8193..1a9cf1dfec 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4301675a1c..fdf00447d4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -216,7 +215,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -225,7 +224,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index e46e3066e3..ceab97b75a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java index 98a11e46e8..e38514cadb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java index 0c9160d0f6..349348672f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -46,7 +46,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2909,7 +2908,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3960,22 +3959,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5323,7 +5322,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5356,11 +5355,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6235,7 +6234,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6480,7 +6479,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6606,12 +6605,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6670,7 +6669,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7189,7 +7188,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7274,7 +7273,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7389,7 +7388,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7710,7 +7709,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7772,7 +7771,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7847,7 +7846,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7970,7 +7969,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8061,7 +8060,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12519,7 +12518,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12759,7 +12758,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12811,7 +12810,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12832,7 +12831,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12841,7 +12840,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13200,7 +13199,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14165,7 +14164,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index c524e8d97a..5bd6d12029 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -21,7 +21,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -282,13 +281,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java index 4c81bef118..84182fd985 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -516,7 +515,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -555,7 +554,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1005,12 +1004,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2057,7 +2056,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2069,7 +2068,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2111,7 +2110,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2147,7 +2146,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2241,12 +2240,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2298,7 +2297,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2324,7 +2323,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2709,7 +2708,7 @@ public class Clan implements IIdentifiable, INamable public void addMasterySkill(int id) { - getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, Chronos.currentTimeMillis() + 1296000000); + getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, System.currentTimeMillis() + 1296000000); final ScheduledFuture task = ThreadPool.schedule(() -> removeMasterySkill(id), 1296000000); // 1296000000 = 15 days masterySkillTasks.add(task); addNewSkill(SkillData.getInstance().getSkill(id, 1)); @@ -2728,7 +2727,7 @@ public class Clan implements IIdentifiable, INamable { return -1; } - return (int) (endTime - Chronos.currentTimeMillis()); + return (int) (endTime - System.currentTimeMillis()); } public void setDevelopmentPoints(int count) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 4e8db32a55..d035db80b3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bda337fdb1..c0a3f3e48a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -206,7 +205,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -229,7 +228,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1582,7 +1581,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1861,7 +1860,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2518,7 +2517,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index d5cd3dcb89..66feeee146 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.enums.QuestSound; @@ -88,7 +87,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 2eb72eef2a..fd681ab3d4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 8b717f05e3..afa106ab93 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -547,7 +546,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java index 27c7525c68..d9a48df4f0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java index d78aa5ee0a..524d427d9c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index aed8356181..476907b225 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -534,7 +533,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index feb15f90ba..95b03f4b3b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -129,7 +128,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 502e2a0f00..af65e15cae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index cbcbb3e785..cb451b1074 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index f8df3d17a5..3b4d20980c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISMISSED); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 063447c290..944032499e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanLevelData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 7e97cf22af..b327d72320 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index f2f60163d9..639e1bcdf8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 560580862d..35be5945ff 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index f417f016e4..344826973a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -266,7 +265,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 815217150e..2022810da2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.instancemanager.PremiumManager; @@ -252,7 +251,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -340,7 +339,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index 35159829b3..8ca61e5e9b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -517,7 +516,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader final GlobalVariablesManager vars = GlobalVariablesManager.getInstance(); final long var = vars.getLong("FourSepulchers" + npcId, 0) + (TIME_ATTACK * 60 * 1000); - if (var > Chronos.currentTimeMillis()) + if (var > System.currentTimeMillis()) { showHtmlFile(player, npcId + "-NE.html", npc, null); return; @@ -582,7 +581,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader ThreadPool.schedule(() -> ZoneManager.getInstance().getZoneById(MANAGER_ZONES.get(npcId)).oustAllPlayers(), TIME_ATTACK * 60 * 1000); // Save attack time - vars.set("FourSepulchers" + npcId, Chronos.currentTimeMillis()); + vars.set("FourSepulchers" + npcId, System.currentTimeMillis()); // Init progress STORED_PROGRESS.put(sepulcherId, 1); // start from 1 // Start diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index 74c9a62e5e..e4edb350d4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -124,7 +123,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -150,7 +149,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java index 48dfe2211a..0ce3b63fe1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java @@ -21,7 +21,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -94,7 +93,7 @@ public class Anakim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_anakim", time, null, null); @@ -128,7 +127,7 @@ public class Anakim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -268,7 +267,7 @@ public class Anakim extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid())// Anakim and minions { // Anti BUGGERS @@ -300,7 +299,7 @@ public class Anakim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ANAKIM, info); startQuestTimer("unlock_anakim", respawnTime, null, null); @@ -360,7 +359,7 @@ public class Anakim extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java index 734b106e74..f4ae4aa580 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -135,7 +134,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -148,7 +147,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -203,7 +202,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -369,7 +368,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -377,7 +376,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -478,7 +477,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -658,7 +657,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index f30803fc3b..cddedb8609 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -92,7 +91,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java index cb5c274ba9..00c7e9bea0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -332,7 +331,7 @@ public class EtisVanEtina extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_etina", time, null, null); @@ -360,7 +359,7 @@ public class EtisVanEtina extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE) { @@ -515,7 +514,7 @@ public class EtisVanEtina extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Anti BUGGERS if (!BOSS_ZONE.isInsideZone(attacker)) { @@ -698,7 +697,7 @@ public class EtisVanEtina extends AbstractNpcAI _paragon.setInvul(true); BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true))); GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); } } @@ -730,7 +729,7 @@ public class EtisVanEtina extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD); final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ETIS_VAN_ETINA1, info); startQuestTimer("unlock_etina", respawnTime, null, null); startQuestTimer("end_etina", 900000, null, null); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java index dedaec9b94..5c351fd118 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java @@ -20,7 +20,6 @@ package ai.bosses.Fafurion; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -85,7 +84,7 @@ public class Fafurion extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_fafurion", time, null, null); @@ -450,7 +449,7 @@ public class Fafurion extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD); final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info); startQuestTimer("unlock_fafurion", respawnTime, null, null); if (_stage < 7) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 7fa9f125f9..a07501ed22 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -296,7 +295,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -689,7 +688,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java index c1596cfcbf..88c871b9ab 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -93,7 +92,7 @@ public class Lilith extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LILITH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lilith", time, null, null); @@ -127,7 +126,7 @@ public class Lilith extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE); for (Creature creature : BOSS_ZONE.getCharactersInside()) @@ -251,7 +250,7 @@ public class Lilith extends AbstractNpcAI // Spawn the rb _lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0); GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null, true); startQuestTimer("end_lilith", 60 * 60000, null, null); // 1h } @@ -261,7 +260,7 @@ public class Lilith extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.isMinion() || npc.isRaid()) // Lilith and minions { // Anti BUGGERS @@ -293,7 +292,7 @@ public class Lilith extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LILITH, DEAD); final long respawnTime = getRespawnTime(); final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LILITH, info); startQuestTimer("unlock_lilith", respawnTime, null, null); @@ -353,7 +352,7 @@ public class Lilith extends AbstractNpcAI { reenter = day2; } - return reenter.getTimeInMillis() - Chronos.currentTimeMillis(); + return reenter.getTimeInMillis() - System.currentTimeMillis(); } @Override diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 2fe2f79d46..50a6e42559 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -89,7 +88,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -310,7 +309,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index b41ffbd3ec..f7223ad2a4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -137,7 +136,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -167,7 +166,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -186,7 +185,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -300,7 +299,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -402,7 +401,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -413,12 +412,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -540,7 +539,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -568,13 +567,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index 2dd0d3a589..b1bbe24b1a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index c8a478264d..8170db2b9d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index a022d1f7a0..ea601d1f9b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -134,7 +134,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 3db8b9e550..a8f534ca97 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 9f5b8d48ab..b45e872a60 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java index dd781227d6..ff0f02aa95 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_07.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index f76eeff808..b71176a555 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 0d96e66052..a6666bb367 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index a3a239e6ef..a3c2f5e8dc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java index b96243b027..4256e9042d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -67,7 +66,7 @@ public class TrainingWithDandy extends LongTimeEvent { npc.setTarget(player); npc.doCast(DANDY_CH.getSkill()); - player.getVariables().set(GIVE_DANDI_BUFF_VAR, Chronos.currentTimeMillis()); + player.getVariables().set(GIVE_DANDI_BUFF_VAR, System.currentTimeMillis()); player.broadcastStatusUpdate(); htmltext = "33894-2.htm"; break; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_06.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index 3e6856f28b..84ecda758a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -176,7 +175,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 91a45e8295..4487c4454f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c96507110f..61f032c511 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 3518b4f5fd..6e26d5563b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index b49ceb854f..8f5638c09e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -89,7 +88,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java index 69facc61a4..6940d15827 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10825_ForVictory/Q10825_ForVictory.java @@ -16,7 +16,6 @@ */ package quests.Q10825_ForVictory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -139,7 +138,7 @@ public class Q10825_ForVictory extends Quest case "mark": { final long TIME_CHECK = Long.parseLong(qs.get("TimeCheck")); - final long CURRENT_TIME = Chronos.currentTimeMillis(); + final long CURRENT_TIME = System.currentTimeMillis(); final long SIEGE_LENGTH = 7200000; // 2 hours in milliseconds switch (npc.getId()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java index 04211718f1..332bf0e828 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -189,7 +188,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -475,7 +474,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java index 71ad2e4de6..b9b6c1d758 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java index 706a49f876..c2f2d6ba65 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 3ce3716f0e..0bd0848a08 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 564d275801..53f4033548 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -187,7 +186,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7b8cb97fa5..839ac176a7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.enums.SpecialItemType; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -126,7 +125,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer { entry.setStatus(DailyMissionStatus.COMPLETED); } - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 48a6f07b3c..d42033fbf4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 3583c73bf3..404118bf7d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -73,7 +72,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -106,7 +105,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 8c0e8600ac..5e348183a3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index 7a127a3114..81000d4940 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.StatSet; @@ -42,7 +41,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 100; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 84 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 194558b5e0..fd8166f3e8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -332,7 +331,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -350,7 +349,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -634,7 +633,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Petition.java index 6a274245d0..8b79a94469 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9e68194133..3ee82f2561 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -216,7 +215,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -225,7 +224,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5fe2273d82..f4efe2e7d8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java index 98a11e46e8..e38514cadb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index 2370ec0be8..7bb124ecea 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -47,7 +47,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2846,7 +2845,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3897,22 +3896,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5288,7 +5287,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5321,11 +5320,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6200,7 +6199,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6444,7 +6443,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6570,12 +6569,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6634,7 +6633,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7204,7 +7203,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7289,7 +7288,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7404,7 +7403,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7725,7 +7724,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7787,7 +7786,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7862,7 +7861,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7985,7 +7984,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8076,7 +8075,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12555,7 +12554,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12795,7 +12794,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12847,7 +12846,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12868,7 +12867,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12877,7 +12876,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13236,7 +13235,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14206,7 +14205,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index c524e8d97a..5bd6d12029 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -21,7 +21,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -282,13 +281,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java index 07f0d3f6c7..58ad487175 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -515,7 +514,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -554,7 +553,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1004,12 +1003,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2056,7 +2055,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2068,7 +2067,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2110,7 +2109,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2146,7 +2145,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2240,12 +2239,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2297,7 +2296,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2323,7 +2322,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2708,7 +2707,7 @@ public class Clan implements IIdentifiable, INamable public void addMasterySkill(int id) { - getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, Chronos.currentTimeMillis() + 1296000000); + getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, System.currentTimeMillis() + 1296000000); final ScheduledFuture task = ThreadPool.schedule(() -> removeMasterySkill(id), 1296000000); // 1296000000 = 15 days masterySkillTasks.add(task); addNewSkill(SkillData.getInstance().getSkill(id, 1)); @@ -2727,7 +2726,7 @@ public class Clan implements IIdentifiable, INamable { return -1; } - return (int) (endTime - Chronos.currentTimeMillis()); + return (int) (endTime - System.currentTimeMillis()); } public void setDevelopmentPoints(int count) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 074ac313ff..0692cd2014 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5172d566a8..6315bb208f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bda337fdb1..c0a3f3e48a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -206,7 +205,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -229,7 +228,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1582,7 +1581,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1861,7 +1860,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2518,7 +2517,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03b432add..953dadaabf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.enums.QuestSound; @@ -88,7 +87,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index be9e88c11d..22accd82c3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 8b717f05e3..afa106ab93 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -547,7 +546,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java index 27c7525c68..d9a48df4f0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java index 3eb91c09e5..c69bfddce1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1449,9 +1448,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 216936d275..f6b018bc89 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -538,7 +537,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index a25aae077c..8e362ca27a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -129,7 +128,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 502e2a0f00..af65e15cae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index cbcbb3e785..cb451b1074 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 063447c290..944032499e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanLevelData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 7e97cf22af..b327d72320 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 51d71c3154..c367a7a173 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index f417f016e4..344826973a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -266,7 +265,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 531e0ca348..eb27fe958f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -110,13 +109,13 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > System.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); final long lastEntryTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_ENTRY + _zoneId, 0); if ((lastEntryTime + holder.getResetDelay()) < currentTime) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 815217150e..2022810da2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.instancemanager.PremiumManager; @@ -252,7 +251,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -340,7 +339,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 49389feeea..5b3919fd7c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index 74c9a62e5e..e4edb350d4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -124,7 +123,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -150,7 +149,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java index 734b106e74..f4ae4aa580 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -135,7 +134,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -148,7 +147,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -203,7 +202,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -369,7 +368,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -377,7 +376,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -478,7 +477,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -658,7 +657,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index cb47743fdb..e03416b746 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -94,7 +93,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java index c6cb7eeff0..072bfac22e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -332,7 +331,7 @@ public class EtisVanEtina extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_etina", time, null, null); @@ -360,7 +359,7 @@ public class EtisVanEtina extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE) { @@ -515,7 +514,7 @@ public class EtisVanEtina extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Anti BUGGERS if (!BOSS_ZONE.isInsideZone(attacker)) { @@ -698,7 +697,7 @@ public class EtisVanEtina extends AbstractNpcAI _paragon.setInvul(true); BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true))); GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); } } @@ -730,7 +729,7 @@ public class EtisVanEtina extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD); final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ETIS_VAN_ETINA1, info); startQuestTimer("unlock_etina", respawnTime, null, null); startQuestTimer("end_etina", 900000, null, null); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java index 7aca7ed414..41fb0a71ed 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java @@ -20,7 +20,6 @@ package ai.bosses.Fafurion; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -85,7 +84,7 @@ public class Fafurion extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_fafurion", time, null, null); @@ -450,7 +449,7 @@ public class Fafurion extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD); final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info); startQuestTimer("unlock_fafurion", respawnTime, null, null); if (_stage < 7) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 4e0aed2c70..0f1883b1e5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -273,7 +272,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -666,7 +665,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 2fe2f79d46..50a6e42559 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -89,7 +88,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -310,7 +309,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index b41ffbd3ec..f7223ad2a4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -137,7 +136,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -167,7 +166,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -186,7 +185,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -300,7 +299,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -402,7 +401,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -413,12 +412,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -540,7 +539,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -568,13 +567,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index ad18f4a959..523bb946c7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java index 1b554d8114..c935feb000 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/AetherDrops.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -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.Player; @@ -98,13 +97,13 @@ public class AetherDrops extends AbstractNpcAI final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_YEAR, 1); } cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); } else if (event.equals("reset")) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index c8a478264d..8170db2b9d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index a022d1f7a0..ea601d1f9b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -134,7 +134,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 3db8b9e550..a8f534ca97 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 9f5b8d48ab..b45e872a60 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java index dd781227d6..ff0f02aa95 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_08.2_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index f76eeff808..b71176a555 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 0d96e66052..a6666bb367 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index d5f1e3ec3f..ca8181c354 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java index b96243b027..4256e9042d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -67,7 +66,7 @@ public class TrainingWithDandy extends LongTimeEvent { npc.setTarget(player); npc.doCast(DANDY_CH.getSkill()); - player.getVariables().set(GIVE_DANDI_BUFF_VAR, Chronos.currentTimeMillis()); + player.getVariables().set(GIVE_DANDI_BUFF_VAR, System.currentTimeMillis()); player.broadcastStatusUpdate(); htmltext = "33894-2.htm"; break; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java index 6dd54637a0..154aa2b39f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -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.Player; @@ -53,7 +52,7 @@ public class DecreaseWaitingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long creationTime = player.getVariables().getLong(PlayerVariables.HOMUNCULUS_CREATION_TIME, 0); final long waitTime = 0; // 86400 = 24 Hours if (creationTime == 0) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_07.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index afac5f0554..a3859cd7e2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -179,7 +178,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 91a45e8295..4487c4454f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c96507110f..61f032c511 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 3518b4f5fd..6e26d5563b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java index a7578d6d4a..43f0560a19 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java @@ -16,7 +16,6 @@ */ package instances.KastiaExceptional; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaExceptional extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java index e772807433..fec3334290 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java @@ -16,7 +16,6 @@ */ package instances.KastiaExtreme; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaExtreme extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java index 6ea73ac54d..08bb78f5a7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java @@ -16,7 +16,6 @@ */ package instances.KastiaHard; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaHard extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java index 0c6e0a2e85..43c43a7d24 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java @@ -16,7 +16,6 @@ */ package instances.KastiaLow; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaLow extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java index f663a3feb2..c0c87b85f8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java @@ -16,7 +16,6 @@ */ package instances.KastiaMedium; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaMedium extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java index 65d0c8e0e9..eb7d9adb9a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java @@ -18,7 +18,6 @@ package instances.KrofinNest; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; @@ -123,7 +122,7 @@ public class KrofinNest extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index f0437189d3..17ec828820 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +91,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java index f3cb5c764c..820e07ec23 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -229,7 +228,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java index b6f0fc0962..d684727c09 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -245,7 +244,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java index 7987a30e90..7a502df559 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -213,7 +212,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/GameServer.java index 1b696a07bf..10356ab3d0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -189,7 +188,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -475,7 +474,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/Shutdown.java index 71ad2e4de6..b9b6c1d758 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java index 706a49f876..c2f2d6ba65 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 3ce3716f0e..0bd0848a08 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 564d275801..53f4033548 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -187,7 +186,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7b8cb97fa5..839ac176a7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.enums.SpecialItemType; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -126,7 +125,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer { entry.setStatus(DailyMissionStatus.COMPLETED); } - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 48a6f07b3c..d42033fbf4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 4c63a7615b..427379143b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -73,7 +72,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -106,7 +105,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 123042a55d..88cbfb4fd0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -525,7 +524,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -560,7 +559,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -619,7 +618,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 8c0e8600ac..5e348183a3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index ea3ce3a461..aedea21b96 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.StatSet; @@ -42,7 +41,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 500; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 84 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 194558b5e0..fd8166f3e8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -332,7 +331,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -350,7 +349,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -634,7 +633,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Petition.java index 6a274245d0..8b79a94469 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/World.java index e0df75f9c3..0c0e12e687 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/World.java @@ -29,7 +29,6 @@ import java.util.function.Predicate; 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.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; @@ -97,7 +96,7 @@ public class World private static final AtomicInteger _memberInPartyNumber = new AtomicInteger(); private static final Set _pkPlayers = ConcurrentHashMap.newKeySet(30); - private static final AtomicInteger _lastPkTime = new AtomicInteger((int) Chronos.currentTimeMillis() / 1000); + private static final AtomicInteger _lastPkTime = new AtomicInteger((int) System.currentTimeMillis() / 1000); private static final WorldRegion[][] _worldRegions = new WorldRegion[REGIONS_X + 1][REGIONS_Y + 1]; @@ -846,13 +845,13 @@ public class World } } _pkPlayers.add(player); - _lastPkTime.set((int) Chronos.currentTimeMillis() / 1000); + _lastPkTime.set((int) System.currentTimeMillis() / 1000); } public void removePkPlayer(Player player) { _pkPlayers.remove(player); - _lastPkTime.set((int) Chronos.currentTimeMillis() / 1000); + _lastPkTime.set((int) System.currentTimeMillis() / 1000); } public Set getPkPlayers() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9e68194133..3ee82f2561 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -216,7 +215,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -225,7 +224,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1a53838b08..5fbbb3178d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java index 3e7281078e..359622553f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index ec38c7307e..65d20c468b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -47,7 +47,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2877,7 +2876,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3928,22 +3927,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5332,7 +5331,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5365,11 +5364,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6295,7 +6294,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6539,7 +6538,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6667,12 +6666,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6732,7 +6731,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7304,7 +7303,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7391,7 +7390,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7506,7 +7505,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7827,7 +7826,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7889,7 +7888,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7964,7 +7963,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -8087,7 +8086,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8178,7 +8177,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12671,7 +12670,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12911,7 +12910,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12963,7 +12962,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12984,7 +12983,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12993,7 +12992,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13352,7 +13351,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14277,7 +14276,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index c524e8d97a..5bd6d12029 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -21,7 +21,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -282,13 +281,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java index 07f0d3f6c7..58ad487175 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -515,7 +514,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -554,7 +553,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1004,12 +1003,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2056,7 +2055,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2068,7 +2067,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2110,7 +2109,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2146,7 +2145,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2240,12 +2239,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2297,7 +2296,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2323,7 +2322,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2708,7 +2707,7 @@ public class Clan implements IIdentifiable, INamable public void addMasterySkill(int id) { - getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, Chronos.currentTimeMillis() + 1296000000); + getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, System.currentTimeMillis() + 1296000000); final ScheduledFuture task = ThreadPool.schedule(() -> removeMasterySkill(id), 1296000000); // 1296000000 = 15 days masterySkillTasks.add(task); addNewSkill(SkillData.getInstance().getSkill(id, 1)); @@ -2727,7 +2726,7 @@ public class Clan implements IIdentifiable, INamable { return -1; } - return (int) (endTime - Chronos.currentTimeMillis()); + return (int) (endTime - System.currentTimeMillis()); } public void setDevelopmentPoints(int count) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 074ac313ff..0692cd2014 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5172d566a8..6315bb208f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 6d893c11e6..2fd8f5e328 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -563,7 +562,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -573,7 +572,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -590,7 +589,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 4360620a36..cb1bf25e72 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -206,7 +205,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -229,7 +228,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1582,7 +1581,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1861,7 +1860,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2518,7 +2517,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 20b222a2a2..fb239220d0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index be9e88c11d..22accd82c3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e2945568aa..e63fbfb564 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 22074f54c9..a37f196024 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -300,7 +299,7 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (endtime > Chronos.currentTimeMillis()) + if (endtime > System.currentTimeMillis()) { ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } @@ -335,7 +334,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java index 27c7525c68..d9a48df4f0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java index 5583e123ce..3dfb03a9df 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0828a7770e..f63e0ee456 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -553,7 +552,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index d73651863e..44a25407fe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -129,7 +128,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 502e2a0f00..af65e15cae 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index cbcbb3e785..cb451b1074 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 063447c290..944032499e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanLevelData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 7e97cf22af..b327d72320 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 51d71c3154..c367a7a173 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index c01216235a..044db2322b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -268,7 +267,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java index 4f474058c1..dec3277cf4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; @@ -55,7 +54,7 @@ public class RequestExHomunculusCreateStart implements IClientIncomingPacket return; } player.reduceAdena("Homunculus creation", COST, player, true); - player.getVariables().set(PlayerVariables.HOMUNCULUS_CREATION_TIME, Chronos.currentTimeMillis() + CREATION_TIME); + player.getVariables().set(PlayerVariables.HOMUNCULUS_CREATION_TIME, System.currentTimeMillis() + CREATION_TIME); client.sendPacket(new ExShowHomunculusBirthInfo(player)); client.sendPacket(new ExHomunculusCreateStartResult(player)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index 8630a97e62..01d691a780 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.HomunculusData; import org.l2jmobius.gameserver.model.actor.Player; @@ -57,7 +56,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket final int vpPoints = player.getVariables().getInt(PlayerVariables.HOMUNCULUS_VP_POINTS, 0); final int homunculusCreateTime = (int) (player.getVariables().getLong(PlayerVariables.HOMUNCULUS_CREATION_TIME, 0) / 1000); - if ((homunculusCreateTime > 0) && ((Chronos.currentTimeMillis() / 1000) >= homunculusCreateTime) && (hpPoints == 100) && (spPoints == 10) && (vpPoints == 5)) + if ((homunculusCreateTime > 0) && ((System.currentTimeMillis() / 1000) >= homunculusCreateTime) && (hpPoints == 100) && (spPoints == 10) && (vpPoints == 5)) { int chance; int random; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 531e0ca348..eb27fe958f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -110,13 +109,13 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > System.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); final long lastEntryTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_ENTRY + _zoneId, 0); if ((lastEntryTime + holder.getResetDelay()) < currentTime) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 5f884b565a..cce0abc2e4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index a5af63da43..052bf88e69 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -230,7 +229,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -319,7 +318,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 96224b45ff..36d05e9317 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index 74c9a62e5e..e4edb350d4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -124,7 +123,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -150,7 +149,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java index 734b106e74..f4ae4aa580 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -135,7 +134,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -148,7 +147,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -203,7 +202,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -369,7 +368,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -377,7 +376,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -478,7 +477,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -658,7 +657,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index cc1060f1b7..8ba08b4ff5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -101,7 +100,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java index c6cb7eeff0..072bfac22e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -332,7 +331,7 @@ public class EtisVanEtina extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_etina", time, null, null); @@ -360,7 +359,7 @@ public class EtisVanEtina extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE) { @@ -515,7 +514,7 @@ public class EtisVanEtina extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Anti BUGGERS if (!BOSS_ZONE.isInsideZone(attacker)) { @@ -698,7 +697,7 @@ public class EtisVanEtina extends AbstractNpcAI _paragon.setInvul(true); BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true))); GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); } } @@ -730,7 +729,7 @@ public class EtisVanEtina extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD); final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ETIS_VAN_ETINA1, info); startQuestTimer("unlock_etina", respawnTime, null, null); startQuestTimer("end_etina", 900000, null, null); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java index 7aca7ed414..41fb0a71ed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java @@ -20,7 +20,6 @@ package ai.bosses.Fafurion; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -85,7 +84,7 @@ public class Fafurion extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_fafurion", time, null, null); @@ -450,7 +449,7 @@ public class Fafurion extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD); final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info); startQuestTimer("unlock_fafurion", respawnTime, null, null); if (_stage < 7) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 4e0aed2c70..0f1883b1e5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -273,7 +272,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -666,7 +665,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 2fe2f79d46..50a6e42559 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -89,7 +88,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -310,7 +309,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 580a3c835c..69f8397c06 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -17,7 +17,6 @@ package ai.bosses.QueenAnt; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -51,7 +50,7 @@ public class QueenAnt extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(QUEEN_ANT) == DEAD) { // Load the unlock date and time for queen ant from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) // If queen ant is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. { startQuestTimer("queen_unlock", temp, null, null); @@ -107,7 +106,7 @@ public class QueenAnt extends AbstractNpcAI // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN_ANT); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN_ANT, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index b41ffbd3ec..f7223ad2a4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -137,7 +136,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -167,7 +166,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -186,7 +185,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -300,7 +299,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -402,7 +401,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -413,12 +412,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -540,7 +539,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -568,13 +567,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index ad18f4a959..523bb946c7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java index 1b554d8114..c935feb000 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/AetherDrops.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -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.Player; @@ -98,13 +97,13 @@ public class AetherDrops extends AbstractNpcAI final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_YEAR, 1); } cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); } else if (event.equals("reset")) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index c8a478264d..8170db2b9d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java index 28863a4c9b..4ecef14c56 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GreedyTreasureChests.java @@ -19,7 +19,6 @@ package ai.others; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -208,7 +207,7 @@ public final class GreedyTreasureChests extends AbstractNpcAI else if (getRandom(150) == TREASURE_CHEST_CHANCE) { final int npcId = npc.getId(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_SV, npcId)) { if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SV_1", 0)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java index ced5bd599c..8fb254b1b7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -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.Player; @@ -76,7 +75,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI calendar.set(Calendar.MINUTE, 30); cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); } else if (event.equals("reset")) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index a022d1f7a0..ea601d1f9b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -134,7 +134,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java index 305a69de73..62f39d0166 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/DreamMaker/DreamMaker.java @@ -16,7 +16,6 @@ */ package events.DreamMaker; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -170,10 +169,10 @@ public class DreamMaker extends LongTimeEvent { htmltext = "34590-buff-no-level.htm"; } - else if ((player.getVariables().getLong("DREAM_MAKER_BUFF_DELAY", 0) + 86400000) >= Chronos.currentTimeMillis()) + else if ((player.getVariables().getLong("DREAM_MAKER_BUFF_DELAY", 0) + 86400000) >= System.currentTimeMillis()) { npc.doCast(getRandomEntry(BUFFS).getSkill()); - player.getVariables().set("DREAM_MAKER_BUFF_DELAY", Chronos.currentTimeMillis()); + player.getVariables().set("DREAM_MAKER_BUFF_DELAY", System.currentTimeMillis()); htmltext = "34590-buff-received.htm"; } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 3db8b9e550..a8f534ca97 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 9f5b8d48ab..b45e872a60 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java index 2cc4b4ae1e..a8e4acdaa5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LegendsMark/LegendsMark.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -245,7 +244,7 @@ public class LegendsMark extends LongTimeEvent calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); break; } case "reset": diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index f76eeff808..b71176a555 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 0d96e66052..a6666bb367 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index d5f1e3ec3f..ca8181c354 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java index b96243b027..4256e9042d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -67,7 +66,7 @@ public class TrainingWithDandy extends LongTimeEvent { npc.setTarget(player); npc.doCast(DANDY_CH.getSkill()); - player.getVariables().set(GIVE_DANDI_BUFF_VAR, Chronos.currentTimeMillis()); + player.getVariables().set(GIVE_DANDI_BUFF_VAR, System.currentTimeMillis()); player.broadcastStatusUpdate(); htmltext = "33894-2.htm"; break; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java index 6dd54637a0..154aa2b39f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -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.Player; @@ -53,7 +52,7 @@ public class DecreaseWaitingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long creationTime = player.getVariables().getLong(PlayerVariables.HOMUNCULUS_CREATION_TIME, 0); final long waitTime = 0; // 86400 = 24 Hours if (creationTime == 0) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_08.2_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index d7ee2ec6bd..c4a573af25 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -218,7 +217,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 91a45e8295..4487c4454f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c96507110f..61f032c511 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 3518b4f5fd..6e26d5563b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java index a7578d6d4a..43f0560a19 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java @@ -16,7 +16,6 @@ */ package instances.KastiaExceptional; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaExceptional extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java index e772807433..fec3334290 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java @@ -16,7 +16,6 @@ */ package instances.KastiaExtreme; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaExtreme extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java index 6ea73ac54d..08bb78f5a7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java @@ -16,7 +16,6 @@ */ package instances.KastiaHard; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaHard extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java index 0c6e0a2e85..43c43a7d24 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java @@ -16,7 +16,6 @@ */ package instances.KastiaLow; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaLow extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java index f663a3feb2..c0c87b85f8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java @@ -16,7 +16,6 @@ */ package instances.KastiaMedium; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaMedium extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java index 2e2eaf51f7..931374632f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java @@ -18,7 +18,6 @@ package instances.KrofinNest; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; @@ -157,7 +156,7 @@ public class KrofinNest extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 4e778e6719..88520731b0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -102,7 +101,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 56686e46d8..5f1d771719 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java index 628ec17b7c..3052179539 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java @@ -18,7 +18,6 @@ package instances.SpiritForest; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -70,7 +69,7 @@ public class SpiritForest extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java index f3cb5c764c..820e07ec23 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -229,7 +228,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java index b6f0fc0962..d684727c09 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -245,7 +244,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java index 7987a30e90..7a502df559 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -213,7 +212,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/GameServer.java index 2b657e678c..8c570caf91 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -190,7 +189,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -477,7 +476,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/Shutdown.java index 71ad2e4de6..b9b6c1d758 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8eb3963246..248feaef13 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java index 706a49f876..c2f2d6ba65 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 3ce3716f0e..0bd0848a08 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 564d275801..53f4033548 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -187,7 +186,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7b8cb97fa5..839ac176a7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.enums.SpecialItemType; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -126,7 +125,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer { entry.setStatus(DailyMissionStatus.COMPLETED); } - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 48a6f07b3c..d42033fbf4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index b9baffa157..ebdb1879de 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -74,7 +73,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -107,7 +106,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 123042a55d..88cbfb4fd0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -525,7 +524,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -560,7 +559,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -619,7 +618,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 8c0e8600ac..5e348183a3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index ea3ce3a461..aedea21b96 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.StatSet; @@ -42,7 +41,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 500; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 84 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java index 5f086c18f9..d777ef3dc2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java @@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; @@ -76,7 +75,7 @@ public class BalthusEventManager LOGGER.info(getClass().getSimpleName() + ": Loaded " + _templates.size() + " rewards."); final Calendar calendar = Calendar.getInstance(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long hours = calendar.get(Calendar.HOUR_OF_DAY); final long mins = calendar.get(Calendar.MINUTE); long startDelay; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 194558b5e0..fd8166f3e8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -332,7 +331,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -350,7 +349,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -634,7 +633,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Petition.java index 6a274245d0..8b79a94469 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/World.java index e0df75f9c3..0c0e12e687 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/World.java @@ -29,7 +29,6 @@ import java.util.function.Predicate; 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.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; @@ -97,7 +96,7 @@ public class World private static final AtomicInteger _memberInPartyNumber = new AtomicInteger(); private static final Set _pkPlayers = ConcurrentHashMap.newKeySet(30); - private static final AtomicInteger _lastPkTime = new AtomicInteger((int) Chronos.currentTimeMillis() / 1000); + private static final AtomicInteger _lastPkTime = new AtomicInteger((int) System.currentTimeMillis() / 1000); private static final WorldRegion[][] _worldRegions = new WorldRegion[REGIONS_X + 1][REGIONS_Y + 1]; @@ -846,13 +845,13 @@ public class World } } _pkPlayers.add(player); - _lastPkTime.set((int) Chronos.currentTimeMillis() / 1000); + _lastPkTime.set((int) System.currentTimeMillis() / 1000); } public void removePkPlayer(Player player) { _pkPlayers.remove(player); - _lastPkTime.set((int) Chronos.currentTimeMillis() / 1000); + _lastPkTime.set((int) System.currentTimeMillis() / 1000); } public Set getPkPlayers() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9e68194133..3ee82f2561 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -216,7 +215,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -225,7 +224,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1a53838b08..5fbbb3178d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java index 3e7281078e..359622553f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index ed81c0390f..e6d88f94a9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -47,7 +47,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2894,7 +2893,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3945,22 +3944,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5349,7 +5348,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5382,11 +5381,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6312,7 +6311,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6556,7 +6555,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6684,12 +6683,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6749,7 +6748,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7330,7 +7329,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7417,7 +7416,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7532,7 +7531,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7853,7 +7852,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7915,7 +7914,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7990,7 +7989,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -8113,7 +8112,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8204,7 +8203,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12698,7 +12697,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12938,7 +12937,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12990,7 +12989,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -13011,7 +13010,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -13020,7 +13019,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13390,7 +13389,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14315,7 +14314,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index c524e8d97a..5bd6d12029 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -21,7 +21,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -282,13 +281,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java index 07f0d3f6c7..58ad487175 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -515,7 +514,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -554,7 +553,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1004,12 +1003,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2056,7 +2055,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2068,7 +2067,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2110,7 +2109,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2146,7 +2145,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2240,12 +2239,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2297,7 +2296,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2323,7 +2322,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2708,7 +2707,7 @@ public class Clan implements IIdentifiable, INamable public void addMasterySkill(int id) { - getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, Chronos.currentTimeMillis() + 1296000000); + getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, System.currentTimeMillis() + 1296000000); final ScheduledFuture task = ThreadPool.schedule(() -> removeMasterySkill(id), 1296000000); // 1296000000 = 15 days masterySkillTasks.add(task); addNewSkill(SkillData.getInstance().getSkill(id, 1)); @@ -2727,7 +2726,7 @@ public class Clan implements IIdentifiable, INamable { return -1; } - return (int) (endTime - Chronos.currentTimeMillis()); + return (int) (endTime - System.currentTimeMillis()); } public void setDevelopmentPoints(int count) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 074ac313ff..0692cd2014 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5172d566a8..6315bb208f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 6d893c11e6..2fd8f5e328 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -563,7 +562,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -573,7 +572,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -590,7 +589,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 4360620a36..cb1bf25e72 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -206,7 +205,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -229,7 +228,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1582,7 +1581,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1861,7 +1860,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2518,7 +2517,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 20b222a2a2..fb239220d0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index be9e88c11d..22accd82c3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e2945568aa..e63fbfb564 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 22074f54c9..a37f196024 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -300,7 +299,7 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (endtime > Chronos.currentTimeMillis()) + if (endtime > System.currentTimeMillis()) { ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } @@ -335,7 +334,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java index 27c7525c68..d9a48df4f0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java index 5583e123ce..3dfb03a9df 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9eea1885f4..ae53ea4fa4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -558,7 +557,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index d73651863e..44a25407fe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -129,7 +128,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 502e2a0f00..af65e15cae 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index cbcbb3e785..cb451b1074 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 063447c290..944032499e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanLevelData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 7e97cf22af..b327d72320 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 51d71c3154..c367a7a173 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index c01216235a..044db2322b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -268,7 +267,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java index 4f474058c1..dec3277cf4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; @@ -55,7 +54,7 @@ public class RequestExHomunculusCreateStart implements IClientIncomingPacket return; } player.reduceAdena("Homunculus creation", COST, player, true); - player.getVariables().set(PlayerVariables.HOMUNCULUS_CREATION_TIME, Chronos.currentTimeMillis() + CREATION_TIME); + player.getVariables().set(PlayerVariables.HOMUNCULUS_CREATION_TIME, System.currentTimeMillis() + CREATION_TIME); client.sendPacket(new ExShowHomunculusBirthInfo(player)); client.sendPacket(new ExHomunculusCreateStartResult(player)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index d62de0a603..f1a28c90e8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.HomunculusData; import org.l2jmobius.gameserver.model.actor.Player; @@ -57,7 +56,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket final int vpPoints = player.getVariables().getInt(PlayerVariables.HOMUNCULUS_VP_POINTS, 0); final int homunculusCreateTime = (int) (player.getVariables().getLong(PlayerVariables.HOMUNCULUS_CREATION_TIME, 0) / 1000); - if ((homunculusCreateTime > 0) && ((Chronos.currentTimeMillis() / 1000) >= homunculusCreateTime) && (hpPoints == 100) && (spPoints == 10) && (vpPoints == 5)) + if ((homunculusCreateTime > 0) && ((System.currentTimeMillis() / 1000) >= homunculusCreateTime) && (hpPoints == 100) && (spPoints == 10) && (vpPoints == 5)) { int chance; int random; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 531e0ca348..eb27fe958f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -110,13 +109,13 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > System.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); final long lastEntryTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_ENTRY + _zoneId, 0); if ((lastEntryTime + holder.getResetDelay()) < currentTime) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 5f884b565a..cce0abc2e4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index a5af63da43..052bf88e69 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -230,7 +229,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -319,7 +318,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 96224b45ff..36d05e9317 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index 74c9a62e5e..e4edb350d4 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -124,7 +123,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -150,7 +149,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java index 734b106e74..f4ae4aa580 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -135,7 +134,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -148,7 +147,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -203,7 +202,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -369,7 +368,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -377,7 +376,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -478,7 +477,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -658,7 +657,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index cc1060f1b7..8ba08b4ff5 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -101,7 +100,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java index c6cb7eeff0..072bfac22e 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -332,7 +331,7 @@ public class EtisVanEtina extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_etina", time, null, null); @@ -360,7 +359,7 @@ public class EtisVanEtina extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE) { @@ -515,7 +514,7 @@ public class EtisVanEtina extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Anti BUGGERS if (!BOSS_ZONE.isInsideZone(attacker)) { @@ -698,7 +697,7 @@ public class EtisVanEtina extends AbstractNpcAI _paragon.setInvul(true); BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true))); GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); } } @@ -730,7 +729,7 @@ public class EtisVanEtina extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD); final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ETIS_VAN_ETINA1, info); startQuestTimer("unlock_etina", respawnTime, null, null); startQuestTimer("end_etina", 900000, null, null); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java index 7aca7ed414..41fb0a71ed 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java @@ -20,7 +20,6 @@ package ai.bosses.Fafurion; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -85,7 +84,7 @@ public class Fafurion extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_fafurion", time, null, null); @@ -450,7 +449,7 @@ public class Fafurion extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD); final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info); startQuestTimer("unlock_fafurion", respawnTime, null, null); if (_stage < 7) diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 4e0aed2c70..0f1883b1e5 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -273,7 +272,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -666,7 +665,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 35cf6ec652..9e51ccc325 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -89,7 +88,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -310,7 +309,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 580a3c835c..69f8397c06 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -17,7 +17,6 @@ package ai.bosses.QueenAnt; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -51,7 +50,7 @@ public class QueenAnt extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(QUEEN_ANT) == DEAD) { // Load the unlock date and time for queen ant from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) // If queen ant is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. { startQuestTimer("queen_unlock", temp, null, null); @@ -107,7 +106,7 @@ public class QueenAnt extends AbstractNpcAI // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN_ANT); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN_ANT, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index b41ffbd3ec..f7223ad2a4 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -137,7 +136,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -167,7 +166,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -186,7 +185,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -300,7 +299,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -402,7 +401,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -413,12 +412,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -540,7 +539,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -568,13 +567,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index ad18f4a959..523bb946c7 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java index 1f0419f392..09fcd70cd2 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -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.Player; @@ -257,13 +256,13 @@ public class AetherDrops extends AbstractNpcAI final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_YEAR, 1); } cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); } else if (event.equals("reset")) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 68a9777e3e..2fd3e63327 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java index 28863a4c9b..4ecef14c56 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java @@ -19,7 +19,6 @@ package ai.others; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -208,7 +207,7 @@ public final class GreedyTreasureChests extends AbstractNpcAI else if (getRandom(150) == TREASURE_CHEST_CHANCE) { final int npcId = npc.getId(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_SV, npcId)) { if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SV_1", 0)) diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java index ced5bd599c..8fb254b1b7 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -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.Player; @@ -76,7 +75,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI calendar.set(Calendar.MINUTE, 30); cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); } else if (event.equals("reset")) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index a022d1f7a0..ea601d1f9b 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -134,7 +134,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java index 305a69de73..62f39d0166 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java @@ -16,7 +16,6 @@ */ package events.DreamMaker; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -170,10 +169,10 @@ public class DreamMaker extends LongTimeEvent { htmltext = "34590-buff-no-level.htm"; } - else if ((player.getVariables().getLong("DREAM_MAKER_BUFF_DELAY", 0) + 86400000) >= Chronos.currentTimeMillis()) + else if ((player.getVariables().getLong("DREAM_MAKER_BUFF_DELAY", 0) + 86400000) >= System.currentTimeMillis()) { npc.doCast(getRandomEntry(BUFFS).getSkill()); - player.getVariables().set("DREAM_MAKER_BUFF_DELAY", Chronos.currentTimeMillis()); + player.getVariables().set("DREAM_MAKER_BUFF_DELAY", System.currentTimeMillis()); htmltext = "34590-buff-received.htm"; } else diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 73f20c4443..6f192db71e 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 8a36f636eb..2e928991d8 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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_AGAIN_IN_S2_H_S3_MIN); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java index 2cc4b4ae1e..a8e4acdaa5 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -245,7 +244,7 @@ public class LegendsMark extends LongTimeEvent calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); break; } case "reset": diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 22ffe09404..e5c62e710d 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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_AGAIN_IN_S2_H_S3_MIN); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index cc3ab3dd2b..8fa82b5c0f 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index d5f1e3ec3f..ca8181c354 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java index b96243b027..4256e9042d 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -67,7 +66,7 @@ public class TrainingWithDandy extends LongTimeEvent { npc.setTarget(player); npc.doCast(DANDY_CH.getSkill()); - player.getVariables().set(GIVE_DANDI_BUFF_VAR, Chronos.currentTimeMillis()); + player.getVariables().set(GIVE_DANDI_BUFF_VAR, System.currentTimeMillis()); player.broadcastStatusUpdate(); htmltext = "33894-2.htm"; break; diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java index 6dd54637a0..154aa2b39f 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -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.Player; @@ -53,7 +52,7 @@ public class DecreaseWaitingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long creationTime = player.getVariables().getLong(PlayerVariables.HOMUNCULUS_CREATION_TIME, 0); final long waitTime = 0; // 86400 = 24 Hours if (creationTime == 0) diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_10.1_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index d7ee2ec6bd..c4a573af25 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -218,7 +217,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 3e248828bb..17b74785c8 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c96507110f..61f032c511 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 4b4672a8bf..3e99ec3559 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java index 05e873f71f..aaa5c66885 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java @@ -16,7 +16,6 @@ */ package instances.KastiaExceptional; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaExceptional extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java index 4a70bd3d82..ea2a99ae81 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java @@ -16,7 +16,6 @@ */ package instances.KastiaExtreme; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaExtreme extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java index a0ff284955..489540a05e 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java @@ -16,7 +16,6 @@ */ package instances.KastiaHard; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaHard extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java index 25d78db484..05de98f418 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java @@ -16,7 +16,6 @@ */ package instances.KastiaLow; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaLow extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java index 2dc7911a33..d019ff5cfc 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java @@ -16,7 +16,6 @@ */ package instances.KastiaMedium; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaMedium extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java index 2e2eaf51f7..931374632f 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java @@ -18,7 +18,6 @@ package instances.KrofinNest; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; @@ -157,7 +156,7 @@ public class KrofinNest extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 4e778e6719..88520731b0 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -102,7 +101,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 12207a5b9f..b872ceea2c 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java index 628ec17b7c..3052179539 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java @@ -18,7 +18,6 @@ package instances.SpiritForest; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -70,7 +69,7 @@ public class SpiritForest extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java index ab57c2a172..4b38ed2427 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -229,7 +228,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java index 139ff231bf..bbeb27a09a 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -245,7 +244,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java index 7a4c3c927f..ca6fab4f8e 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -213,7 +212,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/GameServer.java index bbb6059ff3..90abc2e3c1 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -192,7 +191,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -481,7 +480,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java index 12973dc5d8..9150ce48b4 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java index 14ec398f99..bb3309057a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MIN_YOU_HAVE_S2_POINT_S_LEFT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 83cbb6d14b..16fd81c4d7 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 564d275801..53f4033548 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -187,7 +186,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7b8cb97fa5..839ac176a7 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.enums.SpecialItemType; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -126,7 +125,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer { entry.setStatus(DailyMissionStatus.COMPLETED); } - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index e9c1c707d4..ddfb0df4c7 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_TIME_S2_MIN_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 6220aef86f..70b0d5d9bb 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.LimitShopData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -76,7 +75,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -109,7 +108,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 123042a55d..88cbfb4fd0 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -525,7 +524,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -560,7 +559,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -619,7 +618,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 8c0e8600ac..5e348183a3 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index ea3ce3a461..aedea21b96 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.StatSet; @@ -42,7 +41,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 500; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 84 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java index 38a1af8240..3a5be7eff7 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java @@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; @@ -76,7 +75,7 @@ public class BalthusEventManager LOGGER.info(getClass().getSimpleName() + ": Loaded " + _templates.size() + " rewards."); final Calendar calendar = Calendar.getInstance(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long hours = calendar.get(Calendar.HOUR_OF_DAY); final long mins = calendar.get(Calendar.MINUTE); long startDelay; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java index fbbd725e67..7b15c03bce 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -332,7 +331,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -350,7 +349,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -634,7 +633,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Petition.java index 49e613a3fc..d6f2dbf32e 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/World.java index e0df75f9c3..0c0e12e687 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/World.java @@ -29,7 +29,6 @@ import java.util.function.Predicate; 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.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; @@ -97,7 +96,7 @@ public class World private static final AtomicInteger _memberInPartyNumber = new AtomicInteger(); private static final Set _pkPlayers = ConcurrentHashMap.newKeySet(30); - private static final AtomicInteger _lastPkTime = new AtomicInteger((int) Chronos.currentTimeMillis() / 1000); + private static final AtomicInteger _lastPkTime = new AtomicInteger((int) System.currentTimeMillis() / 1000); private static final WorldRegion[][] _worldRegions = new WorldRegion[REGIONS_X + 1][REGIONS_Y + 1]; @@ -846,13 +845,13 @@ public class World } } _pkPlayers.add(player); - _lastPkTime.set((int) Chronos.currentTimeMillis() / 1000); + _lastPkTime.set((int) System.currentTimeMillis() / 1000); } public void removePkPlayer(Player player) { _pkPlayers.remove(player); - _lastPkTime.set((int) Chronos.currentTimeMillis() / 1000); + _lastPkTime.set((int) System.currentTimeMillis() / 1000); } public Set getPkPlayers() diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index c7ff09dfb6..5811604e4d 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -216,7 +215,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -225,7 +224,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java index ccf17e63fe..0032381d1f 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java index 3e7281078e..359622553f 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 38e209d7ea..1b0b58509c 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -47,7 +47,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2896,7 +2895,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3978,22 +3977,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5382,7 +5381,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5415,11 +5414,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6345,7 +6344,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6589,7 +6588,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6717,12 +6716,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6782,7 +6781,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7367,7 +7366,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7454,7 +7453,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7569,7 +7568,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7890,7 +7889,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7952,7 +7951,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -8027,7 +8026,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -8150,7 +8149,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8241,7 +8240,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12748,7 +12747,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12988,7 +12987,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -13040,7 +13039,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -13061,7 +13060,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -13070,7 +13069,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13440,7 +13439,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14377,7 +14376,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 9a445b6716..cebdc41ece 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -21,7 +21,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -282,13 +281,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_S1_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java index 3bd319a342..13e37f6352 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -515,7 +514,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -554,7 +553,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1004,12 +1003,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2056,7 +2055,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return false; @@ -2068,7 +2067,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(target.getName()); @@ -2110,7 +2109,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_CAN_ACCEPT_A_NEW_CLAN_IN_THE_ALLIANCE_IN_24_H_AFTER_DISMISSING_ANOTHER_ONE); return false; @@ -2146,7 +2145,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2240,12 +2239,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2297,7 +2296,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_IS_DISBANDED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2323,7 +2322,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2708,7 +2707,7 @@ public class Clan implements IIdentifiable, INamable public void addMasterySkill(int id) { - getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, Chronos.currentTimeMillis() + 1296000000); + getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, System.currentTimeMillis() + 1296000000); final ScheduledFuture task = ThreadPool.schedule(() -> removeMasterySkill(id), 1296000000); // 1296000000 = 15 days masterySkillTasks.add(task); addNewSkill(SkillData.getInstance().getSkill(id, 1)); @@ -2727,7 +2726,7 @@ public class Clan implements IIdentifiable, INamable { return -1; } - return (int) (endTime - Chronos.currentTimeMillis()); + return (int) (endTime - System.currentTimeMillis()); } public void setDevelopmentPoints(int count) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index b8e3e48da6..3d390d1c84 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index c6a359d343..e8e00fb9ba 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 6d893c11e6..2fd8f5e328 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -563,7 +562,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -573,7 +572,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -590,7 +589,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index a0fd889952..842d385a19 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 4360620a36..cb1bf25e72 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -206,7 +205,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -229,7 +228,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1582,7 +1581,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1861,7 +1860,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2518,7 +2517,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index a039bd4ac9..62fbb52b8c 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 6a3523aceb..0d9104ee74 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 71ca70252e..3396422d6b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 5b1773f5d8..aebeb46ec7 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 22074f54c9..a37f196024 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -300,7 +299,7 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (endtime > Chronos.currentTimeMillis()) + if (endtime > System.currentTimeMillis()) { ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } @@ -335,7 +334,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 2fb931a64c..a596f81eca 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java index 27c7525c68..d9a48df4f0 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java index 406915baec..4747943f87 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 548befc4da..c3511dae34 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 6ba2c80c6b..b9e6eab661 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a9819a8a61..352c53f837 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -562,7 +561,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_ARE_DISMISSED_FROM_A_CLAN_YOU_CANNOT_JOIN_ANOTHER_FOR_24_H); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 90773a19b4..271d9b2688 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -129,7 +128,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 502e2a0f00..af65e15cae 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index cbcbb3e785..cb451b1074 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 73c7d4aa2c..479f357641 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index cf2cfd0254..1a643b81a0 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanLevelData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(player.getName()); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 7e97cf22af..b327d72320 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 51d71c3154..c367a7a173 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 743f92515d..7ff8b8c71b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 922070a4d2..4a80a358cb 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -268,7 +267,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java index 193219f9ba..9764bb52ea 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; @@ -55,7 +54,7 @@ public class RequestExHomunculusCreateStart implements IClientIncomingPacket return; } player.reduceAdena("Homunculus creation", COST, player, true); - player.getVariables().set(PlayerVariables.HOMUNCULUS_CREATION_TIME, Chronos.currentTimeMillis() + CREATION_TIME); + player.getVariables().set(PlayerVariables.HOMUNCULUS_CREATION_TIME, System.currentTimeMillis() + CREATION_TIME); client.sendPacket(new ExShowHomunculusBirthInfo(player)); client.sendPacket(new ExHomunculusCreateStartResult(player)); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index d62de0a603..f1a28c90e8 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.HomunculusData; import org.l2jmobius.gameserver.model.actor.Player; @@ -57,7 +56,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket final int vpPoints = player.getVariables().getInt(PlayerVariables.HOMUNCULUS_VP_POINTS, 0); final int homunculusCreateTime = (int) (player.getVariables().getLong(PlayerVariables.HOMUNCULUS_CREATION_TIME, 0) / 1000); - if ((homunculusCreateTime > 0) && ((Chronos.currentTimeMillis() / 1000) >= homunculusCreateTime) && (hpPoints == 100) && (spPoints == 10) && (vpPoints == 5)) + if ((homunculusCreateTime > 0) && ((System.currentTimeMillis() / 1000) >= homunculusCreateTime) && (hpPoints == 100) && (spPoints == 10) && (vpPoints == 5)) { int chance; int random; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 9883cace91..4167df6d93 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -110,13 +109,13 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > System.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); final long lastEntryTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_ENTRY + _zoneId, 0); if ((lastEntryTime + holder.getResetDelay()) < currentTime) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 36751172ab..b862aa828d 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_CAN_BECOME_A_MENTOR_WHEN_YOUR_MAIN_CLASS_ACHIEVES_LV_105_AND_AWAKENS); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 1982ffee8e..b97d8d412c 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ExperienceData; @@ -232,7 +231,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -323,7 +322,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 96224b45ff..36d05e9317 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index b1d2baff38..8ebada48ed 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 1a5bad379a..54f813c829 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -305,7 +304,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java index 67cacdb3e2..27e969e0c9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java @@ -16,7 +16,6 @@ */ package ai.areas.GainakUnderground.Lailly; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -65,7 +64,7 @@ public class Lailly extends AbstractNpcAI case "okay": { final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false); - if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis())) + if ((instance != null) && (instance.getEndTime() > System.currentTimeMillis())) { switch (instance.getTemplateId()) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java index 74c9a62e5e..e4edb350d4 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/LindviorScene.java @@ -19,7 +19,6 @@ package ai.areas.KeucereusAllianceBase; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -124,7 +123,7 @@ public class LindviorScene extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -150,7 +149,7 @@ public class LindviorScene extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } public static void main(String[] args) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index ac65063ba1..a025e62542 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -112,7 +111,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000); if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate)) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java index 5df8ad35ac..251458ea98 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -230,7 +229,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -255,7 +254,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -273,7 +272,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -318,7 +317,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java index 734b106e74..f4ae4aa580 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -135,7 +134,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -148,7 +147,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -203,7 +202,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -369,7 +368,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -377,7 +376,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -478,7 +477,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -658,7 +657,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java index cc1060f1b7..8ba08b4ff5 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java @@ -18,7 +18,6 @@ package ai.bosses.Baylor; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -101,7 +100,7 @@ public class BaylorWarzone extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index 97bbcba202..8db07e79e9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -109,7 +108,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -350,7 +349,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -508,7 +507,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java index e5e1757f7b..de153239c4 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java index c6cb7eeff0..072bfac22e 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -332,7 +331,7 @@ public class EtisVanEtina extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_etina", time, null, null); @@ -360,7 +359,7 @@ public class EtisVanEtina extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE) { @@ -515,7 +514,7 @@ public class EtisVanEtina extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Anti BUGGERS if (!BOSS_ZONE.isInsideZone(attacker)) { @@ -698,7 +697,7 @@ public class EtisVanEtina extends AbstractNpcAI _paragon.setInvul(true); BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true))); GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); } } @@ -730,7 +729,7 @@ public class EtisVanEtina extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD); final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ETIS_VAN_ETINA1, info); startQuestTimer("unlock_etina", respawnTime, null, null); startQuestTimer("end_etina", 900000, null, null); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java index 7aca7ed414..41fb0a71ed 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java @@ -20,7 +20,6 @@ package ai.bosses.Fafurion; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -85,7 +84,7 @@ public class Fafurion extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_fafurion", time, null, null); @@ -450,7 +449,7 @@ public class Fafurion extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD); final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(FAFURION_GRANDBOSS_ID, info); startQuestTimer("unlock_fafurion", respawnTime, null, null); if (_stage < 7) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java index 4e0aed2c70..0f1883b1e5 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Freya/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -273,7 +272,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -666,7 +665,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java index dad7aed2da..0235b491b0 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -151,7 +150,7 @@ public class Helios extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_helios", time, null, null); @@ -485,7 +484,7 @@ public class Helios extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD); final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(HELIOS3, info); startQuestTimer("unlock_helios", respawnTime, null, null); break; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index a83cffe0cf..27a44fc962 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.Movie; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -121,7 +120,7 @@ public class Kelbim extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(KELBIM); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_kelbim", time, null, null); @@ -156,7 +155,7 @@ public class Kelbim extends AbstractNpcAI } case "check_activity_task": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -193,7 +192,7 @@ public class Kelbim extends AbstractNpcAI { _kelbimBoss = (GrandBoss) addSpawn(KELBIM, -56340, 60801, -269, 54262, false, 0); GrandBossManager.getInstance().addBoss(_kelbimBoss); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("check_activity_task", 60000, null, null); startQuestTimer("stage_all_random_area_attack", getRandom(2, 3) * 60000, null, null); break; @@ -369,7 +368,7 @@ public class Kelbim extends AbstractNpcAI { if (npc.getId() == KELBIM) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); switch (_bossStage) { @@ -434,7 +433,7 @@ public class Kelbim extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD); final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(KELBIM, info); startQuestTimer("unlock_kelbim", respawnTime, null, null); startQuestTimer("end_kelbim", 1800000, null, null); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index cfe01aae18..05475517a1 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; @@ -227,7 +226,7 @@ public class Lindvior extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_lindvior", time, null, null); @@ -855,7 +854,7 @@ public class Lindvior extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD); final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LINDVIOR_RAID, info); startQuestTimer("unlock_lindvior", respawnTime, null, null); } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 35cf6ec652..9e51ccc325 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -89,7 +88,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -310,7 +309,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); startQuestTimer("despawn_minions", 20000, null, null); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 580a3c835c..69f8397c06 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -17,7 +17,6 @@ package ai.bosses.QueenAnt; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -51,7 +50,7 @@ public class QueenAnt extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(QUEEN_ANT) == DEAD) { // Load the unlock date and time for queen ant from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) // If queen ant is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. { startQuestTimer("queen_unlock", temp, null, null); @@ -107,7 +106,7 @@ public class QueenAnt extends AbstractNpcAI // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN_ANT); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN_ANT, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index f617c76b11..7a3322b68a 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -88,7 +87,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -104,7 +103,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java index ca6157d230..eaa4030cd3 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Ramona/Ramona.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -136,7 +135,7 @@ public class Ramona extends AbstractNpcAI addSpawnId(RAMONA_1, RAMONA_2, RAMONA_3); addCreatureSeeId(MP_CONTROL); - final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - Chronos.currentTimeMillis(); + final long temp = GlobalVariablesManager.getInstance().getLong(RAMONA_RESPAWN_VAR, 0) - System.currentTimeMillis(); if (temp > 0) { _boss = Status.DEAD; @@ -166,7 +165,7 @@ public class Ramona extends AbstractNpcAI npc.setInvul(false); cancelQuestTimers("SPAWN_MS"); startQuestTimer("CHECK_ACTIVITY_TASK", 5000, null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); } break; } @@ -185,7 +184,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("GENERATOR_2", getRandom(900000, 1200000), null, null); startQuestTimer("GENERATOR_3", getRandom(1500000, 1800000), null, null); startQuestTimer("GENERATOR_4", getRandom(2100000, 2400000), null, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); startQuestTimer("RAMONA1_SKILL", 6000, _ramona1, null); break; } @@ -299,7 +298,7 @@ public class Ramona extends AbstractNpcAI } case "CHECK_ACTIVITY_TASK": { - if ((_lastAction + 900000) < Chronos.currentTimeMillis()) + if ((_lastAction + 900000) < System.currentTimeMillis()) { for (Creature creature : ZONE.getCharactersInside()) { @@ -401,7 +400,7 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA2", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS", 6000, _ramona2, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: @@ -412,12 +411,12 @@ public class Ramona extends AbstractNpcAI startQuestTimer("SPAWN_RAMONA3", 1000, null, null); startQuestTimer("SPAWN_RAMONA_MINIONS_1", 6000, _ramona3, null); } - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } @@ -539,7 +538,7 @@ public class Ramona extends AbstractNpcAI { _boss = Status.DEAD; final long respawnTime = (Config.RAMONA_SPAWN_INTERVAL + getRandom(-Config.RAMONA_SPAWN_RANDOM, Config.RAMONA_SPAWN_RANDOM)) * 3600000; - GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set(RAMONA_RESPAWN_VAR, System.currentTimeMillis() + respawnTime); startQuestTimer("RAMONA_UNLOCK", respawnTime, null, null); startQuestTimer("END_RAMONA", 90000, null, null); break; @@ -567,13 +566,13 @@ public class Ramona extends AbstractNpcAI case RAMONA_1: { _boss = Status.IN_FIGHT; - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } case RAMONA_2: case RAMONA_3: { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); break; } } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java index ad18f4a959..523bb946c7 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.Movie; @@ -328,7 +327,7 @@ public class Trasken extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("unlock_trasken", time, null, null); @@ -608,7 +607,7 @@ public class Trasken extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD); final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(TRASKEN, info); startQuestTimer("unlock_trasken", respawnTime, null, null); break; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index a1762708ec..0528e31558 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java index 1f0419f392..09fcd70cd2 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/AetherDrops.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -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.Player; @@ -257,13 +256,13 @@ public class AetherDrops extends AbstractNpcAI final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_YEAR, 1); } cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); } else if (event.equals("reset")) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 68a9777e3e..2fd3e63327 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -155,7 +154,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -191,7 +190,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -249,7 +248,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -298,7 +297,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java index 274351f880..cb36ff7939 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/GreedyTreasureChests.java @@ -19,7 +19,6 @@ package ai.others; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -233,7 +232,7 @@ public final class GreedyTreasureChests extends AbstractNpcAI else if (getRandom(150) == TREASURE_CHEST_CHANCE) { final int npcId = npc.getId(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (CommonUtil.contains(TRIGGER_MOBS_LV110_CHEST_SV, npcId)) { if (currentTime > GlobalVariablesManager.getInstance().getLong("TREASURE_CHEST_RESPAWN_SV_1", 0)) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index 9c85cda581..8b3515e12b 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java index ced5bd599c..8fb254b1b7 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/WaterDragonEliteSupplyDrops.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -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.Player; @@ -76,7 +75,7 @@ public class WaterDragonEliteSupplyDrops extends AbstractNpcAI calendar.set(Calendar.MINUTE, 30); cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); } else if (event.equals("reset")) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index a022d1f7a0..ea601d1f9b 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -134,7 +134,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java index 305a69de73..62f39d0166 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/DreamMaker/DreamMaker.java @@ -16,7 +16,6 @@ */ package events.DreamMaker; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -170,10 +169,10 @@ public class DreamMaker extends LongTimeEvent { htmltext = "34590-buff-no-level.htm"; } - else if ((player.getVariables().getLong("DREAM_MAKER_BUFF_DELAY", 0) + 86400000) >= Chronos.currentTimeMillis()) + else if ((player.getVariables().getLong("DREAM_MAKER_BUFF_DELAY", 0) + 86400000) >= System.currentTimeMillis()) { npc.doCast(getRandomEntry(BUFFS).getSkill()); - player.getVariables().set("DREAM_MAKER_BUFF_DELAY", Chronos.currentTimeMillis()); + player.getVariables().set("DREAM_MAKER_BUFF_DELAY", System.currentTimeMillis()); htmltext = "34590-buff-received.htm"; } else diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 73f20c4443..6f192db71e 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 8a36f636eb..2e928991d8 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -95,9 +94,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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_AGAIN_IN_S2_H_S3_MIN); @@ -111,7 +110,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, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java index 2cc4b4ae1e..a8e4acdaa5 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/LegendsMark/LegendsMark.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; @@ -245,7 +244,7 @@ public class LegendsMark extends LongTimeEvent calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); cancelQuestTimers("reset"); - startQuestTimer("reset", calendar.getTimeInMillis() - Chronos.currentTimeMillis(), null, null); + startQuestTimer("reset", calendar.getTimeInMillis() - System.currentTimeMillis(), null, null); break; } case "reset": diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 22ffe09404..e5c62e710d 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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_AGAIN_IN_S2_H_S3_MIN); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index cc3ab3dd2b..8fa82b5c0f 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index d5f1e3ec3f..ca8181c354 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java index b96243b027..4256e9042d 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/TrainingWithDandy/TrainingWithDandy.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -67,7 +66,7 @@ public class TrainingWithDandy extends LongTimeEvent { npc.setTarget(player); npc.doCast(DANDY_CH.getSkill()); - player.getVariables().set(GIVE_DANDI_BUFF_VAR, Chronos.currentTimeMillis()); + player.getVariables().set(GIVE_DANDI_BUFF_VAR, System.currentTimeMillis()); player.broadcastStatusUpdate(); htmltext = "33894-2.htm"; break; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java index 6dd54637a0..154aa2b39f 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -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.Player; @@ -53,7 +52,7 @@ public class DecreaseWaitingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long creationTime = player.getVariables().getLong(PlayerVariables.HOMUNCULUS_CREATION_TIME, 0); final long waitTime = 0; // 86400 = 24 Hours if (creationTime == 0) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_10.2_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_10.1_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java index d7ee2ec6bd..c4a573af25 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java @@ -18,7 +18,6 @@ package instances.AshenShadowRevolutionaries; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -218,7 +217,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index ef534e68d2..fc44fb107c 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -157,7 +156,7 @@ public class CastleDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -175,7 +174,7 @@ public class CastleDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 3e248828bb..17b74785c8 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -118,7 +117,7 @@ public class CeremonyOfChaos extends AbstractNpcAI private CeremonyOfChaos() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule event period end, 1st of next month 00:01. final Calendar periodEnd = Calendar.getInstance(); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java index c96507110f..61f032c511 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java @@ -18,7 +18,6 @@ package instances.CommandPost; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -115,7 +114,7 @@ public class CommandPost extends AbstractInstance final Party party = player.getParty(); if (player.isInParty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (!party.isLeader(player)) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java index 19a88913b9..cf48685f26 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/FortressDungeon/FortressDungeon.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; @@ -170,7 +169,7 @@ public class FortressDungeon extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first raid spawnRaid(instance); } @@ -198,7 +197,7 @@ public class FortressDungeon extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 4b4672a8bf..3e99ec3559 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -470,7 +469,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue().longValue()) + if (System.currentTimeMillis() < entry.getValue().longValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java index 05e873f71f..aaa5c66885 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaExceptional/KastiaExceptional.java @@ -16,7 +16,6 @@ */ package instances.KastiaExceptional; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaExceptional extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java index 4a70bd3d82..ea2a99ae81 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaExtreme/KastiaExtreme.java @@ -16,7 +16,6 @@ */ package instances.KastiaExtreme; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaExtreme extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java index a0ff284955..489540a05e 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaHard/KastiaHard.java @@ -16,7 +16,6 @@ */ package instances.KastiaHard; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaHard extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java index 25d78db484..05de98f418 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaLow/KastiaLow.java @@ -16,7 +16,6 @@ */ package instances.KastiaLow; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaLow extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 299)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java index 2dc7911a33..d019ff5cfc 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KastiaMedium/KastiaMedium.java @@ -16,7 +16,6 @@ */ package instances.KastiaMedium; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -65,7 +64,7 @@ public class KastiaMedium extends AbstractInstance case "enterInstance": { // Cannot enter if player finished another Kastia instance. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((currentTime < InstanceManager.getInstance().getInstanceTime(player, 298)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 300)) // || (currentTime < InstanceManager.getInstance().getInstanceTime(player, 305)) // diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java index 2e2eaf51f7..931374632f 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java @@ -18,7 +18,6 @@ package instances.KrofinNest; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; @@ -157,7 +156,7 @@ public class KrofinNest extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 4e778e6719..88520731b0 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -102,7 +101,7 @@ public class NightmareKamaloka extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java index 12207a5b9f..b872ceea2c 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/PailakaRuneCastle/PailakaRuneCastle.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FriendlyNpc; @@ -261,7 +260,7 @@ public class PailakaRuneCastle extends AbstractInstance public void onInstanceCreated(Instance instance, Player player) { // Put re-enter for instance - REENETER_HOLDER.put(instance.getTemplateId(), Chronos.currentTimeMillis() + REENTER); + REENETER_HOLDER.put(instance.getTemplateId(), System.currentTimeMillis() + REENTER); // Schedule spawn of first wave startQuestTimer("SPAWN_NEXT_WAVE", 120000, null, player, false); // 2 minutes } @@ -281,7 +280,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; @@ -310,7 +309,7 @@ public class PailakaRuneCastle extends AbstractInstance else if (REENETER_HOLDER.containsKey(template.getId())) { final long time = REENETER_HOLDER.get(template.getId()); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { showHtmlFile(groupLeader, "enterRestricted.html"); return false; diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java index 628ec17b7c..3052179539 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java @@ -18,7 +18,6 @@ package instances.SpiritForest; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; @@ -70,7 +69,7 @@ public class SpiritForest extends AbstractInstance return null; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final List members = party.getMembers(); for (Player member : members) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java index 1e5c546d0f..de1a89b6a9 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -229,7 +228,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java index aff41a60f7..d970f216bf 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -245,7 +244,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java index 4fc1dad61f..bd7f8cf042 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java @@ -16,7 +16,6 @@ */ package instances.ThroneOfHeroes; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -213,7 +212,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance if (!killer.isGM()) { // Set clan variable - killer.getClan().getVariables().set("TOH_DONE", Chronos.currentTimeMillis()); + killer.getClan().getVariables().set("TOH_DONE", System.currentTimeMillis()); killer.getClan().getVariables().storeMe(); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/GameServer.java index bbb6059ff3..90abc2e3c1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -192,7 +191,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -481,7 +480,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java index 12973dc5d8..9150ce48b4 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; @@ -532,19 +531,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java index 14ec398f99..bb3309057a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MIN_YOU_HAVE_S2_POINT_S_LEFT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 83cbb6d14b..16fd81c4d7 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 564d275801..53f4033548 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.World; @@ -187,7 +186,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7b8cb97fa5..839ac176a7 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.enums.SpecialItemType; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -126,7 +125,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer { entry.setStatus(DailyMissionStatus.COMPLETED); } - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index e9c1c707d4..ddfb0df4c7 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_TIME_S2_MIN_TYPE_CURSEDSWORD_TO_CHECK_OTHER_INFORMATION); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 6220aef86f..70b0d5d9bb 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.LimitShopData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -76,7 +75,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -109,7 +108,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 123042a55d..88cbfb4fd0 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -525,7 +524,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -560,7 +559,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -619,7 +618,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 8c0e8600ac..5e348183a3 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index ea3ce3a461..aedea21b96 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.StatSet; @@ -42,7 +41,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 500; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 84 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java index 38a1af8240..3a5be7eff7 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/events/BalthusEventManager.java @@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; @@ -76,7 +75,7 @@ public class BalthusEventManager LOGGER.info(getClass().getSimpleName() + ": Loaded " + _templates.size() + " rewards."); final Calendar calendar = Calendar.getInstance(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long hours = calendar.get(Calendar.HOUR_OF_DAY); final long mins = calendar.get(Calendar.MINUTE); long startDelay; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java index fbbd725e67..7b15c03bce 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -332,7 +331,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -350,7 +349,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -634,7 +633,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java index e1654745a9..1db4f0562b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.buylist.Product; @@ -156,7 +155,7 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; _reuseDelay = item.getReuseDelay(); _owner = item.getActingPlayer(); } @@ -165,7 +164,7 @@ public class ItemInfo { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Petition.java index 49e613a3fc..d6f2dbf32e 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/World.java index e0df75f9c3..0c0e12e687 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/World.java @@ -29,7 +29,6 @@ import java.util.function.Predicate; 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.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; @@ -97,7 +96,7 @@ public class World private static final AtomicInteger _memberInPartyNumber = new AtomicInteger(); private static final Set _pkPlayers = ConcurrentHashMap.newKeySet(30); - private static final AtomicInteger _lastPkTime = new AtomicInteger((int) Chronos.currentTimeMillis() / 1000); + private static final AtomicInteger _lastPkTime = new AtomicInteger((int) System.currentTimeMillis() / 1000); private static final WorldRegion[][] _worldRegions = new WorldRegion[REGIONS_X + 1][REGIONS_Y + 1]; @@ -846,13 +845,13 @@ public class World } } _pkPlayers.add(player); - _lastPkTime.set((int) Chronos.currentTimeMillis() / 1000); + _lastPkTime.set((int) System.currentTimeMillis() / 1000); } public void removePkPlayer(Player player) { _pkPlayers.remove(player); - _lastPkTime.set((int) Chronos.currentTimeMillis() / 1000); + _lastPkTime.set((int) System.currentTimeMillis() / 1000); } public Set getPkPlayers() diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index c7ff09dfb6..5811604e4d 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -216,7 +215,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -225,7 +224,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java index ccf17e63fe..0032381d1f 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java index 3e7281078e..359622553f 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index ccdd93a9f2..37d1ea717e 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -47,7 +47,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2896,7 +2895,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3978,22 +3977,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5382,7 +5381,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5415,11 +5414,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6345,7 +6344,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6589,7 +6588,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6717,12 +6716,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6782,7 +6781,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7367,7 +7366,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, _nobleLevel); @@ -7454,7 +7453,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7569,7 +7568,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7890,7 +7889,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7952,7 +7951,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -8027,7 +8026,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -8150,7 +8149,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long timeLeft = getVariables().getLong("HennaDuration" + slot, currentTime) - currentTime; if ((henna.getDuration() < 0) || (timeLeft > 0)) { @@ -8241,7 +8240,7 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long durationInMillis = henna.getDuration() * 60000; getVariables().set("HennaDuration" + i, currentTime + durationInMillis); _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), currentTime + durationInMillis)); @@ -12748,7 +12747,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12988,7 +12987,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -13040,7 +13039,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -13061,7 +13060,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -13070,7 +13069,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13440,7 +13439,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14377,7 +14376,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 9a445b6716..cebdc41ece 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -21,7 +21,6 @@ import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -282,13 +281,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_S1_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java index 3bd319a342..13e37f6352 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -515,7 +514,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -554,7 +553,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1004,12 +1003,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2056,7 +2055,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return false; @@ -2068,7 +2067,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(target.getName()); @@ -2110,7 +2109,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_CAN_ACCEPT_A_NEW_CLAN_IN_THE_ALLIANCE_IN_24_H_AFTER_DISMISSING_ANOTHER_ONE); return false; @@ -2146,7 +2145,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2240,12 +2239,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2297,7 +2296,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_IS_DISBANDED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2323,7 +2322,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; @@ -2708,7 +2707,7 @@ public class Clan implements IIdentifiable, INamable public void addMasterySkill(int id) { - getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, Chronos.currentTimeMillis() + 1296000000); + getVariables().set(ClanVariables.CLAN_MASTERY_SKILL_TIME + id, System.currentTimeMillis() + 1296000000); final ScheduledFuture task = ThreadPool.schedule(() -> removeMasterySkill(id), 1296000000); // 1296000000 = 15 days masterySkillTasks.add(task); addNewSkill(SkillData.getInstance().getSkill(id, 1)); @@ -2727,7 +2726,7 @@ public class Clan implements IIdentifiable, INamable { return -1; } - return (int) (endTime - Chronos.currentTimeMillis()); + return (int) (endTime - System.currentTimeMillis()); } public void setDevelopmentPoints(int count) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index b8e3e48da6..3d390d1c84 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index c6a359d343..e8e00fb9ba 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 6d893c11e6..2fd8f5e328 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -563,7 +562,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -573,7 +572,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -590,7 +589,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index a0fd889952..842d385a19 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 4360620a36..cb1bf25e72 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -206,7 +205,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -229,7 +228,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1582,7 +1581,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1861,7 +1860,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2518,7 +2517,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index a039bd4ac9..62fbb52b8c 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 6a3523aceb..0d9104ee74 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 71ca70252e..3396422d6b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 5b1773f5d8..aebeb46ec7 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 22074f54c9..a37f196024 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -300,7 +299,7 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (endtime > Chronos.currentTimeMillis()) + if (endtime > System.currentTimeMillis()) { ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } @@ -335,7 +334,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 2fb931a64c..a596f81eca 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java index 27c7525c68..d9a48df4f0 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -164,7 +163,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -199,7 +198,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java index 406915baec..4747943f87 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 548befc4da..c3511dae34 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 6ba2c80c6b..b9e6eab661 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a9819a8a61..352c53f837 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -562,7 +561,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_ARE_DISMISSED_FROM_A_CLAN_YOU_CANNOT_JOIN_ANOTHER_FOR_24_H); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 502e2a0f00..af65e15cae 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index cbcbb3e785..cb451b1074 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 73c7d4aa2c..479f357641 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index cf2cfd0254..1a643b81a0 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanLevelData; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(player.getName()); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 7e97cf22af..b327d72320 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 51d71c3154..c367a7a173 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 743f92515d..7ff8b8c71b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 0c97b86d6a..803a8042a2 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -268,7 +267,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java index dcc3a23341..24333e6e4b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -132,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // Fast auto-enchant cheat check. - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 1000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 1000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExAddEnchantScrollItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExAddEnchantScrollItem.java index 56bacccfc2..1991c0f8e3 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.enchant; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -80,7 +79,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantSupportItem.java index 439d004e64..7ef6c5bd42 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.enchant; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -88,7 +87,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); player.sendPacket(new ChangedEnchantTargetItemProbabilityList(player, false)); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java index e569522817..8110271a9e 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.enchant; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); player.sendPacket(new ChangedEnchantTargetItemProbabilityList(player, false)); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java index 193219f9ba..9764bb52ea 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusCreateStart.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; @@ -55,7 +54,7 @@ public class RequestExHomunculusCreateStart implements IClientIncomingPacket return; } player.reduceAdena("Homunculus creation", COST, player, true); - player.getVariables().set(PlayerVariables.HOMUNCULUS_CREATION_TIME, Chronos.currentTimeMillis() + CREATION_TIME); + player.getVariables().set(PlayerVariables.HOMUNCULUS_CREATION_TIME, System.currentTimeMillis() + CREATION_TIME); client.sendPacket(new ExShowHomunculusBirthInfo(player)); client.sendPacket(new ExHomunculusCreateStartResult(player)); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index e3c90547ac..ec603ce4ef 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.HomunculusData; import org.l2jmobius.gameserver.model.actor.Player; @@ -57,7 +56,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket final int vpPoints = player.getVariables().getInt(PlayerVariables.HOMUNCULUS_VP_POINTS, 0); final int homunculusCreateTime = (int) (player.getVariables().getLong(PlayerVariables.HOMUNCULUS_CREATION_TIME, 0) / 1000); - if ((homunculusCreateTime > 0) && ((Chronos.currentTimeMillis() / 1000) >= homunculusCreateTime) && (hpPoints == 100) && (spPoints == 10) && (vpPoints == 5)) + if ((homunculusCreateTime > 0) && ((System.currentTimeMillis() / 1000) >= homunculusCreateTime) && (hpPoints == 100) && (spPoints == 10) && (vpPoints == 5)) { int chance; int random; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 9883cace91..4167df6d93 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -110,13 +109,13 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > System.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); final long lastEntryTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_ENTRY + _zoneId, 0); if ((lastEntryTime + holder.getResetDelay()) < currentTime) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 36751172ab..b862aa828d 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_CAN_BECOME_A_MENTOR_WHEN_YOUR_MAIN_CLASS_ACHIEVES_LV_105_AND_AWAKENS); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index bfb7c8112e..08f39e9d25 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ExperienceData; @@ -232,7 +231,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -324,7 +323,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index b84d2283e8..ce85d2334e 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; @@ -72,7 +71,7 @@ public class HennaInfo implements IClientOutgoingPacket int duration = premium.getDuration(); if (duration > 0) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } packet.writeD(premium.getDyeId()); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/RequestExRemoveEnchantSupportItem.java index aff1a37533..9848617d00 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.enchant; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket { request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); player.sendPacket(new ChangedEnchantTargetItemProbabilityList(player, false)); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 96224b45ff..36d05e9317 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameTimeTaskManager.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameTimeTaskManager.java index ace5cd8331..ec56ed4511 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameTimeTaskManager.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.serverpackets.ServerBasePacket; import org.l2jmobius.gameserver.network.serverpackets.SunRise; import org.l2jmobius.gameserver.network.serverpackets.SunSet; -import org.l2jmobius.util.Chronos; /** * Game Time task manager class. @@ -30,7 +29,7 @@ import org.l2jmobius.util.Chronos; */ public class GameTimeTaskManager extends Thread { - private long _gameStartTime = Chronos.currentTimeMillis() - 3600000L; + private long _gameStartTime = System.currentTimeMillis() - 3600000L; protected GameTimeTaskManager() { @@ -39,7 +38,7 @@ public class GameTimeTaskManager extends Thread public int getGameTime() { - final long time = (Chronos.currentTimeMillis() - _gameStartTime) / 10000L; + final long time = (System.currentTimeMillis() - _gameStartTime) / 10000L; return (int) time; } @@ -52,7 +51,7 @@ public class GameTimeTaskManager extends Thread { broadcastToPlayers(new SunRise()); Thread.sleep(21600000L); - _gameStartTime = Chronos.currentTimeMillis(); + _gameStartTime = System.currentTimeMillis(); broadcastToPlayers(new SunSet()); Thread.sleep(3600000L); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 29ea4b43e9..538f96efa5 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.Attack; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; -import org.l2jmobius.gameserver.network.serverpackets.MoveToLocation; import org.l2jmobius.gameserver.network.serverpackets.Die; import org.l2jmobius.gameserver.network.serverpackets.FinishRotation; +import org.l2jmobius.gameserver.network.serverpackets.MoveToLocation; import org.l2jmobius.gameserver.network.serverpackets.MoveToPawn; import org.l2jmobius.gameserver.network.serverpackets.ServerBasePacket; import org.l2jmobius.gameserver.network.serverpackets.SetToLocation; @@ -46,7 +46,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.TeleportToLocation; import org.l2jmobius.gameserver.templates.Weapon; import org.l2jmobius.gameserver.threads.ThreadPool; -import org.l2jmobius.util.Chronos; import org.l2jmobius.util.Rnd; public abstract class Creature extends WorldObject @@ -193,7 +192,7 @@ public abstract class Creature extends WorldObject { return super.getX(); } - final long elapsed = Chronos.currentTimeMillis() - _moveStartTime; + final long elapsed = System.currentTimeMillis() - _moveStartTime; final int diff = (int) (elapsed * _xAddition); final int remain = Math.abs(getXdestination() - super.getX()) - Math.abs(diff); if (remain > 0) @@ -210,7 +209,7 @@ public abstract class Creature extends WorldObject { return super.getY(); } - final long elapsed = Chronos.currentTimeMillis() - _moveStartTime; + final long elapsed = System.currentTimeMillis() - _moveStartTime; final int diff = (int) (elapsed * _yAddition); final int remain = Math.abs(getYdestination() - super.getY()) - Math.abs(diff); if (remain > 0) @@ -929,7 +928,7 @@ public abstract class Creature extends WorldObject setXdestination(destinationX); setYdestination(destinationY); setZdestination(z); - _moveStartTime = Chronos.currentTimeMillis(); + _moveStartTime = System.currentTimeMillis(); if (_timeToTarget < 0L) { _timeToTarget = 0L; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index c51da95370..1f599d9fd2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -57,7 +57,6 @@ import org.l2jmobius.gameserver.network.Connection; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; -import org.l2jmobius.gameserver.network.serverpackets.MoveToLocation; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; import org.l2jmobius.gameserver.network.serverpackets.GetItem; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; @@ -65,6 +64,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillCanceld; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUser; +import org.l2jmobius.gameserver.network.serverpackets.MoveToLocation; import org.l2jmobius.gameserver.network.serverpackets.MoveToPawn; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; @@ -84,7 +84,6 @@ import org.l2jmobius.gameserver.templates.CharTemplate; import org.l2jmobius.gameserver.templates.ItemTemplate; import org.l2jmobius.gameserver.templates.Weapon; import org.l2jmobius.gameserver.threads.ThreadPool; -import org.l2jmobius.util.Chronos; import org.l2jmobius.util.Rnd; public class Player extends Creature @@ -439,7 +438,7 @@ public class Player extends Creature { _pvpTask = ThreadPool.scheduleAtFixedRate(new pvpTask(), 1000, 1000); } - _lastPvpTime = Chronos.currentTimeMillis() + 30000; + _lastPvpTime = System.currentTimeMillis() + 30000; } if (_pvpFlag == value) { @@ -456,7 +455,7 @@ public class Player extends Creature @Override public void run() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (currentTime > _lastPvpTime) { stopPvPFlag(); @@ -1664,7 +1663,7 @@ public class Player extends Creature public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } public void onMagicUseTimer(Creature target, Skill skill) diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java index 4e6ea5ed44..b76dbe849a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java @@ -43,7 +43,6 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.templates.ItemTemplate; import org.l2jmobius.loginserver.LoginController; -import org.l2jmobius.util.Chronos; public class ClientThread extends Thread { @@ -82,17 +81,17 @@ public class ClientThread extends Thread @Override public void run() { - long starttime = Chronos.currentTimeMillis(); + long starttime = System.currentTimeMillis(); try { try { do { - if ((_activeChar != null) && (_autoSaveTime < (Chronos.currentTimeMillis() - starttime))) + if ((_activeChar != null) && (_autoSaveTime < (System.currentTimeMillis() - starttime))) { saveCharToDisk(_activeChar); - starttime = Chronos.currentTimeMillis(); + starttime = System.currentTimeMillis(); } final byte[] decrypt = _connection.getPacket(); _handler.handlePacket(decrypt); @@ -596,7 +595,7 @@ public class ClientThread extends Thread oldChar.setTitle(st.nextToken().trim()); oldChar.setAllyId(Integer.parseInt(st.nextToken())); World.getInstance().storeObject(oldChar); - oldChar.setUptime(Chronos.currentTimeMillis()); + oldChar.setUptime(System.currentTimeMillis()); lnr.close(); } catch (Exception e) diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 63d0726f3d..91dc84a449 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -34,7 +34,6 @@ import javax.swing.border.LineBorder; import org.l2jmobius.Config; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.util.Chronos; import org.l2jmobius.util.Locator; /** @@ -44,7 +43,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -135,7 +134,7 @@ public class SystemPanel extends JPanel } lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java index e00dcde8b6..232e963768 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.gameserver.network.Connection; -import org.l2jmobius.util.Chronos; public class LoginController { @@ -51,7 +50,7 @@ public class LoginController public int assignSessionKeyToLogin(String account, int accessLevel, Socket cSocket) { int key = -1; - key = (int) Chronos.currentTimeMillis() & 0xFFFFFF; + key = (int) System.currentTimeMillis() & 0xFFFFFF; _logins.put(account, key); _accountsInLoginServer.put(account, cSocket); _accessLevels.put(account, accessLevel); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Chronos.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Chronos.java deleted file mode 100644 index 12fa9e5891..0000000000 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java index d9d857e0db..18d4848f21 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java @@ -24,7 +24,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -212,7 +211,7 @@ public class Antharas extends Quest { final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS_OLD); final Long respawnTime = info.getLong("respawn_time"); - if ((status == DEAD) && (respawnTime <= Chronos.currentTimeMillis())) + if ((status == DEAD) && (respawnTime <= System.currentTimeMillis())) { // The time has already expired while the server was offline. Immediately spawn antharas in his cave. // Also, the status needs to be changed to DORMANT. @@ -230,13 +229,13 @@ public class Antharas extends Quest _antharas = (GrandBoss) addSpawn(ANTHARAS_OLD, x, y, z, heading, false, 0); GrandBossManager.getInstance().addBoss(_antharas); _antharas.setCurrentHpMp(hp, mp); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Start repeating timer to check for inactivity. _activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000); } else if (status == DEAD) { - ThreadPool.schedule(new UnlockAntharas(ANTHARAS_OLD), respawnTime - Chronos.currentTimeMillis()); + ThreadPool.schedule(new UnlockAntharas(ANTHARAS_OLD), respawnTime - System.currentTimeMillis()); } else if (status == DORMANT) { @@ -280,7 +279,7 @@ public class Antharas extends Quest _antharas = (GrandBoss) addSpawn(antharasId, loc_x, loc_y, loc_z, heading, false, 0); GrandBossManager.getInstance().addBoss(_antharas); _antharas.setCurrentHpMp(hp, mp); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Start repeating timer to check for inactivity. _activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000); } @@ -288,7 +287,7 @@ public class Antharas extends Quest { final StatSet info = GrandBossManager.getInstance().getStatSet(antharasId); final Long respawnTime = info.getLong("respawn_time"); - if (respawnTime <= Chronos.currentTimeMillis()) + if (respawnTime <= System.currentTimeMillis()) { // The time has already expired while the server was offline. Immediately spawn antharas in his cave. // Also, the status needs to be changed to DORMANT. @@ -297,7 +296,7 @@ public class Antharas extends Quest } else { - ThreadPool.schedule(new UnlockAntharas(antharasId), respawnTime - Chronos.currentTimeMillis()); + ThreadPool.schedule(new UnlockAntharas(antharasId), respawnTime - System.currentTimeMillis()); } } } @@ -421,7 +420,7 @@ public class Antharas extends Quest _antharas.setImmobilized(true); GrandBossManager.getInstance().setBossStatus(ANTHARAS_OLD, DORMANT); GrandBossManager.getInstance().setBossStatus(npcId, FIGHTING); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Start repeating timer to check for inactivity. _activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000); // Setting 1st time of minions spawn task. @@ -708,7 +707,7 @@ public class Antharas extends Quest @Override public void run() { - final Long temp = (Chronos.currentTimeMillis() - _lastAction); + final Long temp = (System.currentTimeMillis() - _lastAction); if (temp > (Config.ANTHARAS_DESPAWN_TIME * 60000)) { GrandBossManager.getInstance().setBossStatus(_antharas.getNpcId(), DORMANT); @@ -874,7 +873,7 @@ public class Antharas extends Quest { if ((npc.getNpcId() == ANTHARAS_OLD) || (npc.getNpcId() == ANTHARAS_WEAK) || (npc.getNpcId() == ANTHARAS_NORMAL) || (npc.getNpcId() == ANTHARAS_STRONG)) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (!FWA_OLDANTHARAS && (_mobsSpawnTask == null)) { startMinionSpawns(npc.getNpcId()); @@ -918,7 +917,7 @@ public class Antharas extends Quest ThreadPool.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(npc.getNpcId()); - info.set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); GrandBossManager.getInstance().setStatSet(npc.getNpcId(), info); } else if (npc.getNpcId() == 29069) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java index 79ed7a3e0a..6b96934f27 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -108,7 +107,7 @@ public class Baium extends Quest if (status == DEAD) { // Load the unlock date and time for baium from DB. - final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); if (temp > 0) { // The unlock time has not yet expired. Mark Baium as currently locked (dead). @@ -178,7 +177,7 @@ public class Baium extends Quest npc.broadcastPacket(new Earthquake(npc.getX(), npc.getY(), npc.getZ(), 40, 5)); // Start monitoring baium's inactivity. - _lastAttackVsBaiumTime = Chronos.currentTimeMillis(); + _lastAttackVsBaiumTime = System.currentTimeMillis(); startQuestTimer("baium_despawn", 60000, npc, null, true); if (player != null) { @@ -225,7 +224,7 @@ public class Baium extends Quest { _zone = GrandBossManager.getInstance().getZone(113100, 14500, 10077); } - if ((_lastAttackVsBaiumTime + (Config.BAIUM_SLEEP * 1000)) < Chronos.currentTimeMillis()) + if ((_lastAttackVsBaiumTime + (Config.BAIUM_SLEEP * 1000)) < System.currentTimeMillis()) { npc.deleteMe(); // Despawn the live-baium. for (Npc minion : _minions) @@ -242,7 +241,7 @@ public class Baium extends Quest _zone.oustAllPlayers(); cancelQuestTimer("baium_despawn", npc, null); } - else if (((_lastAttackVsBaiumTime + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0))) + else if (((_lastAttackVsBaiumTime + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0))) { npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4135, 1)); @@ -371,7 +370,7 @@ public class Baium extends Quest } } // Update a variable with the last action against Baium. - _lastAttackVsBaiumTime = Chronos.currentTimeMillis(); + _lastAttackVsBaiumTime = System.currentTimeMillis(); callSkillAI(npc); } return super.onAttack(npc, attacker, damage, isPet); @@ -390,7 +389,7 @@ public class Baium extends Quest startQuestTimer("baium_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LIVE_BAIUM, info); for (Npc minion : _minions) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java index 1e79df2164..ea963ff60f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -103,7 +102,7 @@ public class Core extends Quest if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -223,7 +222,7 @@ public class Core extends Quest startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java index e243b43fee..62d389ae13 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java @@ -17,7 +17,6 @@ package ai.bosses; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -64,7 +63,7 @@ public class Orfen extends Quest { case DEAD: { - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("ORFEN_SPAWN", temp, null, null); @@ -218,7 +217,7 @@ public class Orfen extends Quest startQuestTimer("ORFEN_SPAWN", respawnTime, null, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); } return super.onKill(npc, killer, isPet); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java index 5f6ebf54f2..61f9b693c2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -92,7 +91,7 @@ public class QueenAnt extends Quest { case DEAD: { - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("QUEEN_SPAWN", temp, null, null); @@ -352,7 +351,7 @@ public class QueenAnt extends Quest // cancelQuestTimer("CHECK_QA_ZONE", npc, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); startQuestTimer("DESPAWN_MINIONS", 10000, null, null); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java index 8abf66d71a..cc638ca1e5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -84,7 +83,7 @@ public class Valakas extends Quest i_ai3 = 0; i_ai4 = 0; i_quest0 = 0; - lastAttackTime = Chronos.currentTimeMillis(); + lastAttackTime = System.currentTimeMillis(); _zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632); final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); @@ -92,7 +91,7 @@ public class Valakas extends Quest if (status == DEAD) { // Load the unlock date and time for valakas from DB. - final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); // If valakas is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. // Mark valakas as currently locked. Setup a timer to fire at the correct time (calculate the time between now and the unlock time, setup a timer to fire after that many msec). if (temp > 0) @@ -158,7 +157,7 @@ public class Valakas extends Quest } } final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS); - if ((status == FIGHTING) && ((Chronos.currentTimeMillis() - lastAttackTime) > (Config.VALAKAS_DESPAWN_TIME * 60000))) // 15 mins by default. + if ((status == FIGHTING) && ((System.currentTimeMillis() - lastAttackTime) > (Config.VALAKAS_DESPAWN_TIME * 60000))) // 15 mins by default. { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); @@ -340,7 +339,7 @@ public class Valakas extends Quest final GrandBoss valakas = (GrandBoss) addSpawn(VALAKAS, loc_x, loc_y, loc_z, heading, false, 0); GrandBossManager.getInstance().addBoss(valakas); - lastAttackTime = Chronos.currentTimeMillis(); + lastAttackTime = System.currentTimeMillis(); ThreadPool.schedule(() -> { try @@ -375,7 +374,7 @@ public class Valakas extends Quest return null; } - lastAttackTime = Chronos.currentTimeMillis(); + lastAttackTime = System.currentTimeMillis(); // if (!Config.ALLOW_DIRECT_TP_TO_BOSS_ROOM && GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING && !npc.getSpawn().isCustomBossInstance()) { attacker.teleToLocation(150037, -57255, -2976); } if (attacker.getMountType() == 1) { @@ -595,7 +594,7 @@ public class Valakas extends Quest startQuestTimer("valakas_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isPet); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java index d9984c5ddf..ea3912fe60 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -169,7 +168,7 @@ public class Zaken extends Quest if (status == DEAD) { // Load the unlock date and time for zaken from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Zaken is locked until a certain time, mark it so and start the unlock timer. // The unlock time has not yet expired. if (temp > 0) @@ -840,7 +839,7 @@ public class Zaken extends Quest cancelQuestTimer("1003", npc, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); } else if (status == ALIVE) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java index 077ef2f419..f28b23f417 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/GameServer.java @@ -30,7 +30,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -139,7 +138,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -466,7 +465,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java index c4895a33b0..fe4b2163f2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java @@ -20,7 +20,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.WalkerRouteData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.NpcWalkerNode; @@ -92,7 +91,7 @@ public class NpcWalkerAI extends CreatureAI implements Runnable return; } - if (_nextMoveTime < Chronos.currentTimeMillis()) + if (_nextMoveTime < System.currentTimeMillis()) { walkToLocation(); } @@ -155,7 +154,7 @@ public class NpcWalkerAI extends CreatureAI implements Runnable delay = DEFAULT_MOVE_DELAY; } - _nextMoveTime = Chronos.currentTimeMillis() + delay; + _nextMoveTime = System.currentTimeMillis() + delay; setWalkingToNextPoint(false); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index e26360e9e3..9626585aae 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -42,7 +41,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - _cachedWh.put(pc, Chronos.currentTimeMillis()); + _cachedWh.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -55,7 +54,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : _cachedWh.entrySet()) { if ((cTime - entry.getValue().longValue()) > _cacheTime) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 0d47f3b724..5ce3195542 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -30,7 +30,6 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -81,7 +80,7 @@ public class ClanTable clan = getClan(Integer.parseInt(result.getString("clan_id"))); if (clan.getDissolvingExpiryTime() != 0) { - if (clan.getDissolvingExpiryTime() < Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() < System.currentTimeMillis()) { destroyClan(clan.getClanId()); } @@ -180,7 +179,7 @@ public class ClanTable return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -409,7 +408,7 @@ public class ClanTable { destroyClan(clanId); } - }, getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis()); + }, getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis()); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 8c1ab51f07..7adff6b58d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureList; @@ -178,7 +177,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java index 8edfcf9217..020ebea4bf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -158,7 +157,7 @@ public class TradeListTable { int time = 0; long savetimer = 0; - final long currentMillis = Chronos.currentTimeMillis(); + final long currentMillis = System.currentTimeMillis(); final PreparedStatement statement2 = con.prepareStatement("SELECT DISTINCT time, savetimer FROM " + (custom ? "custom_merchant_buylists" : "merchant_buylists") + " WHERE time <> 0 ORDER BY time"); final ResultSet rset2 = statement2.executeQuery(); @@ -168,7 +167,7 @@ public class TradeListTable savetimer = rset2.getLong("savetimer"); if ((savetimer - currentMillis) > 0) { - ThreadPool.schedule(new RestoreCount(time), savetimer - Chronos.currentTimeMillis()); + ThreadPool.schedule(new RestoreCount(time), savetimer - System.currentTimeMillis()); } else { @@ -223,7 +222,7 @@ public class TradeListTable protected void dataTimerSave(int time) { - final long timerSave = Chronos.currentTimeMillis() + (time * 3600000); // 60*60*1000 + final long timerSave = System.currentTimeMillis() + (time * 3600000); // 60*60*1000 try (Connection con = DatabaseFactory.getConnection()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java index de1c064eac..1c4a1dcaeb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; @@ -62,7 +61,7 @@ public class AdminDonator implements IAdminCommandHandler { targetPlayer.setDonator(true); targetPlayer.updateNameTitleColor(); - targetPlayer.getVariables().set("CustomDonatorEnd", Chronos.currentTimeMillis() + donatorTime); + targetPlayer.getVariables().set("CustomDonatorEnd", System.currentTimeMillis() + donatorTime); targetPlayer.sendMessage(activeChar.getName() + " has granted you donator status!"); activeChar.sendMessage("You have granted donator status to " + targetPlayer.getName()); AdminData.broadcastMessageToGMs("Warn: " + activeChar.getName() + " has set " + targetPlayer.getName() + " as donator !"); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminServerInfo.java index 865d193398..1c5887ce1a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java index 8ae65233c2..a86c888316 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +65,7 @@ public class HeroCustomItem implements IItemHandler final long heroTime = Config.HERO_CUSTOM_DAY * 24 * 60 * 60 * 1000; player.getVariables().set("CustomHero", true); - player.getVariables().set("CustomHeroEnd", heroTime == 0 ? 0 : Chronos.currentTimeMillis() + heroTime); + player.getVariables().set("CustomHeroEnd", heroTime == 0 ? 0 : System.currentTimeMillis() + heroTime); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java index 502e524e27..f9d1ada082 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.handler.itemhandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.WorldObject; @@ -72,7 +71,7 @@ public class MOSKey implements IItemHandler return; } - if ((_lastOpen + 1800000) > Chronos.currentTimeMillis()) // 30 * 60 * 1000 = 1800000 + if ((_lastOpen + 1800000) > System.currentTimeMillis()) // 30 * 60 * 1000 = 1800000 { player.sendMessage("You can`t use the key right now."); player.sendPacket(ActionFailed.STATIC_PACKET); @@ -91,7 +90,7 @@ public class MOSKey implements IItemHandler DoorData.getInstance().getDoor(23150003).onOpen(); DoorData.getInstance().getDoor(23150004).onOpen(); player.broadcastPacket(new SocialAction(player.getObjectId(), 3)); - _lastOpen = Chronos.currentTimeMillis(); + _lastOpen = System.currentTimeMillis(); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ClanPenalty.java index 6d8537f876..fab2bd3489 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.handler.usercommandhandlers; import java.text.SimpleDateFormat; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -50,19 +49,19 @@ public class ClanPenalty implements IUserCommandHandler htmlContent.append(""); htmlContent.append(""); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_10.2_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); htmlContent.append(""); penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); htmlContent.append(""); penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append(""); htmlContent.append(""); htmlContent.append(""); htmlContent.append("
Unable to join a clan." + format.format(player.getClanJoinExpiryTime()) + "Unable to create a clan." + format.format(player.getClanCreateExpiryTime()) + "Unable to invite a clan member."); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 4cc2541beb..99e4a098f8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -81,7 +80,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -125,7 +124,7 @@ public class IdManager cleanCount += statement.executeUpdate("DELETE FROM items WHERE items.owner_id NOT IN (SELECT charId FROM characters) AND items.owner_id NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE characters SET clanid=0 WHERE characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -140,7 +139,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index e0e5aaf285..bfb5efd448 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -96,7 +95,7 @@ public class ItemsOnGroundManager } final PreparedStatement statement = con.prepareStatement(str); - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); statement.execute(); statement.close(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index 7abc2ddfbf..2e10a6bd8a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Player; @@ -74,7 +73,7 @@ public class PetitionManager private class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java index ae3161fc71..9b53343a82 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -181,7 +180,7 @@ public class TradeManager { int time = 0; long savetimer = 0; - final long currentMillis = Chronos.currentTimeMillis(); + final long currentMillis = System.currentTimeMillis(); final PreparedStatement statement2 = con.prepareStatement("SELECT DISTINCT time, savetimer FROM merchant_buylists WHERE time <> 0 ORDER BY time"); final ResultSet rset2 = statement2.executeQuery(); @@ -342,7 +341,7 @@ public class TradeManager { int time = 0; long savetimer = 0; - final long currentMillis = Chronos.currentTimeMillis(); + final long currentMillis = System.currentTimeMillis(); final PreparedStatement statement2 = con.prepareStatement("SELECT DISTINCT time, savetimer FROM custom_merchant_buylists WHERE time <> 0 ORDER BY time"); final ResultSet rset2 = statement2.executeQuery(); @@ -428,7 +427,7 @@ public class TradeManager public void dataTimerSave(int time) { - final long timerSave = Chronos.currentTimeMillis() + (time * 60 * 60 * 1000); + final long timerSave = System.currentTimeMillis() + (time * 60 * 60 * 1000); try (Connection con = DatabaseFactory.getConnection()) { final PreparedStatement statement = con.prepareStatement("UPDATE merchant_buylists SET savetimer=? WHERE time=?"); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/EventsGlobalTask.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/EventsGlobalTask.java index 933879cd42..856b30737e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/EventsGlobalTask.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/events/EventsGlobalTask.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; /** * @author Shyla @@ -163,7 +162,7 @@ public class EventsGlobalTask implements Runnable } final Calendar calendar = Calendar.getInstance(); - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); final int hour = calendar.get(Calendar.HOUR_OF_DAY); final int min = calendar.get(Calendar.MINUTE); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index 6e9aa02c2c..eb2f142d3a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -60,7 +59,7 @@ public class Lottery _prize = Config.ALT_LOTTERY_PRIZE; _isSellingTickets = false; _isStarted = false; - _enddate = Chronos.currentTimeMillis(); + _enddate = System.currentTimeMillis(); if (Config.ALLOW_LOTTERY) { new startLottery().run(); @@ -137,7 +136,7 @@ public class Lottery { _prize = rset.getInt("prize"); _enddate = rset.getLong("enddate"); - if (_enddate <= (Chronos.currentTimeMillis() + (2 * MINUTE))) + if (_enddate <= (System.currentTimeMillis() + (2 * MINUTE))) { new finishLottery().run(); rset.close(); @@ -146,14 +145,14 @@ public class Lottery return; } - if (_enddate > Chronos.currentTimeMillis()) + if (_enddate > System.currentTimeMillis()) { _isStarted = true; - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); - if (_enddate > (Chronos.currentTimeMillis() + (12 * MINUTE))) + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); + if (_enddate > (System.currentTimeMillis() + (12 * MINUTE))) { _isSellingTickets = true; - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); } rset.close(); statement.close(); @@ -190,8 +189,8 @@ public class Lottery _enddate = finishtime.getTimeInMillis(); } - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); try (Connection con = DatabaseFactory.getConnection()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Timestamp.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Timestamp.java index c4828b98c3..9f9ed44eec 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Timestamp.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Timestamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; /** * Simple class containing all necessary information to maintain
@@ -34,7 +33,7 @@ public class Timestamp { _skill = skill; _reuse = reuse; - _stamp = Chronos.currentTimeMillis() + _reuse; + _stamp = System.currentTimeMillis() + _reuse; } public Timestamp(Skill skill, long reuse, long stamp) @@ -99,7 +98,7 @@ public class Timestamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -117,7 +116,7 @@ public class Timestamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2fb187d536..38005ffbed 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -408,7 +407,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastToChannelMembers(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -417,7 +416,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } @@ -2701,7 +2700,7 @@ public class Attackable extends Npc @Override public void run() { - if ((Chronos.currentTimeMillis() - _monster.getCommandChannelLastAttack()) > 900000) + if ((System.currentTimeMillis() - _monster.getCommandChannelLastAttack()) > 900000) { _monster.setCommandChannelTimer(null); _monster.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java index a13fe1fe1a..0acce3b2c9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -8579,12 +8578,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder public void reduceCurrentHpByDamOverTime(double amount, Creature attacker, boolean awake, int period) { - if (_nextReducingHPByOverTime > Chronos.currentTimeMillis()) + if (_nextReducingHPByOverTime > System.currentTimeMillis()) { return; } - _nextReducingHPByOverTime = Chronos.currentTimeMillis() + (period * 880); + _nextReducingHPByOverTime = System.currentTimeMillis() + (period * 880); reduceCurrentHp(amount, attacker, awake); } @@ -8592,12 +8591,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder public void reduceCurrentMpByDamOverTime(double amount, int period) { - if (_nextReducingMPByOverTime > Chronos.currentTimeMillis()) + if (_nextReducingMPByOverTime > System.currentTimeMillis()) { return; } - _nextReducingMPByOverTime = Chronos.currentTimeMillis() + (period * 880); + _nextReducingMPByOverTime = System.currentTimeMillis() + (period * 880); reduceCurrentMp(amount); } @@ -8951,7 +8950,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder */ public void updateAttackStance() { - attackStance = Chronos.currentTimeMillis(); + attackStance = System.currentTimeMillis(); } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java index 2b0c2036a0..118e2df259 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; @@ -135,7 +134,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; @@ -578,7 +577,7 @@ public class Npc extends Creature @Override public void onAction(Player player) { - if (!canTarget(player) || ((Chronos.currentTimeMillis() - player.getTimerToAttack()) < Config.CLICK_TASK)) + if (!canTarget(player) || ((System.currentTimeMillis() - player.getTimerToAttack()) < Config.CLICK_TASK)) { return; } @@ -611,7 +610,7 @@ public class Npc extends Creature player.sendPacket(new MyTargetSelected(getObjectId(), 0)); } - player.setTimerToAttack(Chronos.currentTimeMillis()); + player.setTimerToAttack(System.currentTimeMillis()); // Send a Server->Client packet ValidateLocation to correct the Npc position and heading on the client player.sendPacket(new ValidateLocation(this)); } @@ -848,7 +847,7 @@ public class Npc extends Creature player.sendPacket(new MyTargetSelected(getObjectId(), 0)); } - player.setTimerToAttack(Chronos.currentTimeMillis()); + player.setTimerToAttack(System.currentTimeMillis()); player.sendPacket(new ValidateLocation(this)); } else diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java index bbe2d1963e..056083b44f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -915,7 +914,7 @@ public class Player extends Playable } getFreight().restore(); - _instanceLoginTime = Chronos.currentTimeMillis(); + _instanceLoginTime = System.currentTimeMillis(); } /** @@ -931,7 +930,7 @@ public class Player extends Playable super.initCharStatusUpdateValues(); initPcStatusUpdateValues(); - _instanceLoginTime = Chronos.currentTimeMillis(); + _instanceLoginTime = System.currentTimeMillis(); } @Override @@ -2977,7 +2976,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } public long getOnlineTime() @@ -6189,7 +6188,7 @@ public class Player extends Playable return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (getPvpFlag() == 0) { startPvPFlag(); @@ -6231,11 +6230,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (getPvpFlag() == 0) { @@ -6965,7 +6964,7 @@ public class Player extends Playable */ public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -7286,7 +7285,7 @@ public class Player extends Playable { final PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?"); statement.setInt(1, isOnline() ? 1 : 0); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); statement.close(); @@ -7306,7 +7305,7 @@ public class Player extends Playable { final PreparedStatement statement = con.prepareStatement("UPDATE characters SET isIn7sDungeon=?, lastAccess=? WHERE charId=?"); statement.setInt(1, isIn7sDungeon() ? 1 : 0); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); statement.close(); @@ -7413,7 +7412,7 @@ public class Player extends Playable statement.setInt(54, isNewbie() ? 1 : 0); statement.setInt(55, isNoble() ? 1 : 0); statement.setLong(56, 0); - statement.setLong(57, Chronos.currentTimeMillis()); + statement.setLong(57, System.currentTimeMillis()); statement.setString(58, StringToHex(Integer.toHexString(getAppearance().getNameColor()).toUpperCase())); statement.setString(59, StringToHex(Integer.toHexString(getAppearance().getTitleColor()).toUpperCase())); statement.setInt(60, isAio() ? 1 : 0); @@ -7492,12 +7491,12 @@ public class Player extends Playable player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); player.setFirstLog(rset.getInt("first_log")); player._pcBangPoints = rset.getInt("pc_point"); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -7537,7 +7536,7 @@ public class Player extends Playable player.setTitle(rset.getString("title")); player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); curHp = rset.getDouble("curHp"); curCp = rset.getDouble("curCp"); @@ -8037,7 +8036,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(41, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(42, getPunishLevel().value()); @@ -8132,7 +8131,7 @@ public class Player extends Playable statement = con.prepareStatement(ADD_SKILL_SAVE); int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Effect effect : effects) { final int skillId = effect.getSkill().getId(); @@ -8558,7 +8557,7 @@ public class Player extends Playable { PreparedStatement statement; ResultSet rset; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Restore Type 0 These skill were still in effect on the character upon logout. Some of which were self casted and might still have had a long reuse delay which also is restored. statement = con.prepareStatement(RESTORE_SKILL_SAVE); @@ -9206,14 +9205,14 @@ public class Player extends Playable final Effect effect = getFirstEffect(skill); // Like L2OFF toogle skills have little delay - if ((_toggleUse != 0) && ((_toggleUse + 400) > Chronos.currentTimeMillis())) + if ((_toggleUse != 0) && ((_toggleUse + 400) > System.currentTimeMillis())) { _toggleUse = 0; sendPacket(ActionFailed.STATIC_PACKET); return; } - _toggleUse = Chronos.currentTimeMillis(); + _toggleUse = System.currentTimeMillis(); if (effect != null) { // fake death exception @@ -10307,7 +10306,7 @@ public class Player extends Playable protected LookingForFishTask(int fishWaitTime, int fishGutsCheck, int fishType, boolean isNoob, boolean isUpperGrade) { _fishGutsCheck = fishGutsCheck; - _endTaskTime = Chronos.currentTimeMillis() + fishWaitTime + 10000; + _endTaskTime = System.currentTimeMillis() + fishWaitTime + 10000; _fishType = fishType; _isNoob = isNoob; _isUpperGrade = isUpperGrade; @@ -10316,7 +10315,7 @@ public class Player extends Playable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTaskTime) + if (System.currentTimeMillis() >= _endTaskTime) { endFishing(false); return; @@ -14031,7 +14030,7 @@ public class Player extends Playable public void restoreCustomStatus() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (getVariables().getLong("CustomDonatorEnd", 0) > currentTime) { setDonator(true); @@ -14641,7 +14640,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -14681,7 +14680,7 @@ public class Player extends Playable // Prevent falling under ground. sendPacket(new ValidateLocation(this)); - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; return false; } @@ -15079,7 +15078,7 @@ public class Player extends Playable public void addConfirmDlgRequestTime(int requestId, int time) { - _confirmDlgRequests.put(requestId, Chronos.currentTimeMillis() + time + 2000); + _confirmDlgRequests.put(requestId, System.currentTimeMillis() + time + 2000); } public Long getConfirmDlgRequestTime(int requestId) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java index 1e3128921d..71151b35f3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.xml.MapRegionData; @@ -201,7 +200,7 @@ public class Auctioneer extends Folk html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getDesc()); @@ -404,7 +403,7 @@ public class Auctioneer extends Folk html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getDesc()); @@ -435,7 +434,7 @@ public class Auctioneer extends Folk html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getDesc()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 74755313ae..bb5055b61f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -20,7 +20,6 @@ import java.util.Iterator; import java.util.Set; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.SkillTreeTable; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; @@ -627,13 +626,13 @@ public class VillageMaster extends Folk return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); ClanTable.getInstance().scheduleRemoveClan(clan.getClanId()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java index f750a5447c..ee391f663e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -32,7 +32,6 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.SkillTable; @@ -465,7 +464,7 @@ public class Clan if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -483,7 +482,7 @@ public class Clan } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderName().equalsIgnoreCase(name) ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderName().equalsIgnoreCase(name) ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } } @@ -808,14 +807,14 @@ public class Clan setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1794,7 +1793,7 @@ public class Clan } } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); sm.addString(target.getName()); @@ -1810,7 +1809,7 @@ public class Clan return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_HE_SHE_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -1865,7 +1864,7 @@ public class Clan } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -1921,7 +1920,7 @@ public class Clan return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2029,13 +2028,13 @@ public class Clan return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_10_DAYS_AFTER_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_CREATE_AN_ALLIANCE_DURING_THE_TERM_OF_DISSOLUTION_POSTPONEMENT); return; @@ -2104,7 +2103,7 @@ public class Clan broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClans()) { if ((clan.getAllyId() == getAllyId()) && (clan.getClanId() != getClanId())) @@ -2134,7 +2133,7 @@ public class Clan return; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.YOU_CANNOT_RAISE_YOUR_CLAN_LEVEL_DURING_THE_TERM_OF_DISPERSION_POSTPONEMENT); return; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java index ba3af24eff..de98518812 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -1052,7 +1051,7 @@ public class Item extends WorldObject getWorldRegion().addVisibleObject(this); } - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); // this can synchronize on others instancies, so it's out of synchronized, to avoid deadlocks // Add the Item dropped in the world as a visible object diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 5acbe69ea8..663ea256e1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -38,7 +38,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -321,7 +320,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd.intValue()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 88bf012206..5d3cdbb7d0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -183,7 +182,7 @@ public class ClanHall return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(), _endDate - currentTime); @@ -227,7 +226,7 @@ public class ClanHall newfc = false; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(newfc); getOwnerClan().getWarehouse().destroyItemByItemId("CH_function_fee", 57, fee, null, null); ThreadPool.schedule(new FunctionTask(), _rate); @@ -487,7 +486,7 @@ public class ClanHall _ownerId = clan.getClanId(); _isFree = false; - _paidUntil = Chronos.currentTimeMillis(); + _paidUntil = System.currentTimeMillis(); initialyzeTask(true); // Annonce to Online member new ClanHall @@ -748,20 +747,20 @@ public class ClanHall */ private void initialyzeTask(boolean forced) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_paidUntil > currentTime) { ThreadPool.schedule(new FeeTask(), _paidUntil - currentTime); } else if (!_paid && !forced) { - if ((Chronos.currentTimeMillis() + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate)) + if ((System.currentTimeMillis() + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate)) { - ThreadPool.schedule(new FeeTask(), Chronos.currentTimeMillis() + (1000 * 60 * 60 * 24)); + ThreadPool.schedule(new FeeTask(), System.currentTimeMillis() + (1000 * 60 * 60 * 24)); } else { - ThreadPool.schedule(new FeeTask(), (_paidUntil + _chRate) - Chronos.currentTimeMillis()); + ThreadPool.schedule(new FeeTask(), (_paidUntil + _chRate) - System.currentTimeMillis()); } } else @@ -790,25 +789,25 @@ public class ClanHall { if (_paidUntil != 0) { - while (_paidUntil < Chronos.currentTimeMillis()) + while (_paidUntil < System.currentTimeMillis()) { _paidUntil += _chRate; } } else { - _paidUntil = Chronos.currentTimeMillis() + _chRate; + _paidUntil = System.currentTimeMillis() + _chRate; } ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_rental_fee", 57, getLease(), null, null); - ThreadPool.schedule(new FeeTask(), _paidUntil - Chronos.currentTimeMillis()); + ThreadPool.schedule(new FeeTask(), _paidUntil - System.currentTimeMillis()); _paid = true; updateDb(); } else { _paid = false; - if (Chronos.currentTimeMillis() > (_paidUntil + _chRate)) + if (System.currentTimeMillis() > (_paidUntil + _chRate)) { if (ClanHallTable.getInstance().loaded()) { @@ -828,13 +827,13 @@ public class ClanHall sm.addNumber(getLease()); clan.broadcastToOnlineMembers(sm); - if ((Chronos.currentTimeMillis() + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate)) + if ((System.currentTimeMillis() + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate)) { - ThreadPool.schedule(new FeeTask(), Chronos.currentTimeMillis() + (1000 * 60 * 60 * 24)); + ThreadPool.schedule(new FeeTask(), System.currentTimeMillis() + (1000 * 60 * 60 * 24)); } else { - ThreadPool.schedule(new FeeTask(), (_paidUntil + _chRate) - Chronos.currentTimeMillis()); + ThreadPool.schedule(new FeeTask(), (_paidUntil + _chRate) - System.currentTimeMillis()); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index d3bb561916..451cf1fd4a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.AuctionManager; @@ -169,7 +168,7 @@ public class ClanHallAuction public ClanHallAuction(int itemId, Clan clan, long delay, int bid, String name) { _id = itemId; - _endDate = Chronos.currentTimeMillis() + delay; + _endDate = System.currentTimeMillis() + delay; _itemId = itemId; _itemName = name; _itemType = "ClanHall"; @@ -255,7 +254,7 @@ public class ClanHallAuction */ private void startAutoTask() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long taskDelay = 0; if (_endDate <= currentTime) { @@ -368,7 +367,7 @@ public class ClanHallAuction statement.setInt(1, bidder.getClanId()); statement.setString(2, bidder.getClan().getLeaderName()); statement.setInt(3, bid); - statement.setLong(4, Chronos.currentTimeMillis()); + statement.setLong(4, System.currentTimeMillis()); statement.setInt(5, _id); statement.setInt(6, bidder.getClanId()); statement.execute(); @@ -383,7 +382,7 @@ public class ClanHallAuction statement.setString(4, bidder.getName()); statement.setInt(5, bid); statement.setString(6, bidder.getClan().getName()); - statement.setLong(7, Chronos.currentTimeMillis()); + statement.setLong(7, System.currentTimeMillis()); statement.execute(); statement.close(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java index eefde3236c..88e98990f6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.handler.AutoChatHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -483,7 +482,7 @@ public class SevenSigns */ public long getMilliToPeriodChange() { - final long currTimeMillis = Chronos.currentTimeMillis(); + final long currTimeMillis = System.currentTimeMillis(); final long changeTimeMillis = _calendar.getTimeInMillis(); return changeTimeMillis - currTimeMillis; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java index 50fc6fe560..34ad6ff271 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -3640,7 +3639,7 @@ public class SevenSignsFestival implements SpawnListener */ public void setNextCycleStart() { - _nextFestivalCycleStart = Chronos.currentTimeMillis() + Config.ALT_FESTIVAL_CYCLE_LENGTH; + _nextFestivalCycleStart = System.currentTimeMillis() + Config.ALT_FESTIVAL_CYCLE_LENGTH; } /** @@ -3649,7 +3648,7 @@ public class SevenSignsFestival implements SpawnListener */ public void setNextFestivalStart(long milliFromNow) { - _nextFestivalStart = Chronos.currentTimeMillis() + milliFromNow; + _nextFestivalStart = System.currentTimeMillis() + milliFromNow; } /** @@ -3662,7 +3661,7 @@ public class SevenSignsFestival implements SpawnListener { return -1; } - return Math.round((_nextFestivalCycleStart - Chronos.currentTimeMillis()) / 60000); + return Math.round((_nextFestivalCycleStart - System.currentTimeMillis()) / 60000); } /** @@ -3675,7 +3674,7 @@ public class SevenSignsFestival implements SpawnListener { return -1; } - return Math.round((_nextFestivalStart - Chronos.currentTimeMillis()) / 60000) + 1; + return Math.round((_nextFestivalStart - System.currentTimeMillis()) / 60000) + 1; } /** @@ -4004,7 +4003,7 @@ public class SevenSignsFestival implements SpawnListener } // Update the highest scores and party list. - currFestData.set("date", String.valueOf(Chronos.currentTimeMillis())); + currFestData.set("date", String.valueOf(System.currentTimeMillis())); currFestData.set("score", offeringScore); currFestData.set("members", Util.implodeString(partyMembers, ",")); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/ClanHallSiege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/ClanHallSiege.java index b2b1d77d3e..fc0e5fba80 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/ClanHallSiege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/ClanHallSiege.java @@ -23,7 +23,6 @@ import java.util.Calendar; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; /** * @author MHard @@ -61,9 +60,9 @@ public abstract class ClanHallSiege public void setNewSiegeDate(long siegeDate, int clanHallId, int hour) { final Calendar tmpDate = Calendar.getInstance(); - if (siegeDate <= Chronos.currentTimeMillis()) + if (siegeDate <= System.currentTimeMillis()) { - tmpDate.setTimeInMillis(Chronos.currentTimeMillis()); + tmpDate.setTimeInMillis(System.currentTimeMillis()); tmpDate.add(Calendar.DAY_OF_MONTH, 3); tmpDate.set(Calendar.DAY_OF_WEEK, 6); tmpDate.set(Calendar.HOUR_OF_DAY, hour); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Siege.java index 9251582484..f4163187e4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.enums.SiegeTeleportWhoType; @@ -305,12 +304,12 @@ public class Siege player.sendPacket(sound); } - LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has finished! " + fmt.format(new Date(Chronos.currentTimeMillis()))); + LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has finished! " + fmt.format(new Date(System.currentTimeMillis()))); if (getCastle().getOwnerId() <= 0) { announceToPlayer("The siege of " + getCastle().getName() + " has ended in a draw.", false); - LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has ended in a draw. " + fmt.format(new Date(Chronos.currentTimeMillis()))); + LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has ended in a draw. " + fmt.format(new Date(System.currentTimeMillis()))); } // Removes all flags. Note: Remove flag before teleporting players @@ -586,7 +585,7 @@ public class Siege player.sendPacket(sound); } - LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has started! " + fmt.format(new Date(Chronos.currentTimeMillis()))); + LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has started! " + fmt.format(new Date(System.currentTimeMillis()))); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java index 7f43d0ae67..73930c3a77 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java @@ -25,7 +25,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -521,9 +520,9 @@ public class BanditStrongholdSiege extends ClanHallSiege } final Calendar siegeStart = Calendar.getInstance(); siegeStart.setTimeInMillis(getSiegeDate().getTimeInMillis()); - final long registerTimeRemaining = siegeStart.getTimeInMillis() - Chronos.currentTimeMillis(); + final long registerTimeRemaining = siegeStart.getTimeInMillis() - System.currentTimeMillis(); siegeStart.add(Calendar.MINUTE, 60); // HOUR - final long siegeTimeRemaining = siegeStart.getTimeInMillis() - Chronos.currentTimeMillis(); + final long siegeTimeRemaining = siegeStart.getTimeInMillis() - System.currentTimeMillis(); long remaining = registerTimeRemaining; if ((registerTimeRemaining <= 0) && !_registrationPeriod) { @@ -590,7 +589,7 @@ public class BanditStrongholdSiege extends ClanHallSiege cancel(); return; } - final long timeRemaining = _siegeEndDate.getTimeInMillis() - Chronos.currentTimeMillis(); + final long timeRemaining = _siegeEndDate.getTimeInMillis() - System.currentTimeMillis(); if (timeRemaining <= 0) { endSiege(true); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java index 290d4714d5..7ae4c02fd5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -131,7 +130,7 @@ public class DevastatedCastle final RunMessengerSpawn rms = new RunMessengerSpawn(); ThreadPool.schedule(rms, milliToSiege); - final long total_millis = Chronos.currentTimeMillis() + milliToSiege; + final long total_millis = System.currentTimeMillis() + milliToSiege; final GregorianCalendar cal = (GregorianCalendar) Calendar.getInstance(); cal.setTimeInMillis(total_millis); final String next_ch_siege_date = new SimpleDateFormat("yyyy/MM/dd HH:mm").format(cal.getTimeInMillis()); @@ -175,7 +174,7 @@ public class DevastatedCastle private long getMilliToSiege() { - final long currTimeMillis = Chronos.currentTimeMillis(); + final long currTimeMillis = System.currentTimeMillis(); final long siegeTimeMillis = _siegetime.getTimeInMillis(); return siegeTimeMillis - currTimeMillis; } @@ -844,7 +843,7 @@ public class DevastatedCastle { PreparedStatement statement; statement = con.prepareStatement("UPDATE clanhall SET paidUntil=?, paid=? WHERE id=?"); - statement.setLong(1, Chronos.currentTimeMillis() + 59760000); + statement.setLong(1, System.currentTimeMillis() + 59760000); statement.setInt(2, 1); statement.setInt(3, 34); statement.execute(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java index d1ebb10d7d..46681654c9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -116,7 +115,7 @@ public class FortressOfResistance final RunMessengerSpawn rms = new RunMessengerSpawn(); ThreadPool.schedule(rms, milliToCapture); - final long total_millis = Chronos.currentTimeMillis() + milliToCapture; + final long total_millis = System.currentTimeMillis() + milliToCapture; final GregorianCalendar cal = (GregorianCalendar) Calendar.getInstance(); cal.setTimeInMillis(total_millis); final String next_ch_siege_date = new SimpleDateFormat("yyyy/MM/dd HH:mm").format(cal.getTimeInMillis()); @@ -160,7 +159,7 @@ public class FortressOfResistance private long getMilliToCapture() { - final long currTimeMillis = Chronos.currentTimeMillis(); + final long currTimeMillis = System.currentTimeMillis(); final long captureTimeMillis = _capturetime.getTimeInMillis(); return captureTimeMillis - currTimeMillis; } @@ -338,7 +337,7 @@ public class FortressOfResistance { PreparedStatement statement; statement = con.prepareStatement("UPDATE clanhall SET paidUntil=?, paid=? WHERE id=?"); - statement.setLong(1, Chronos.currentTimeMillis() + 59760000); + statement.setLong(1, System.currentTimeMillis() + 59760000); statement.setInt(2, 1); statement.setInt(3, 21); statement.execute(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java index 37f3b213ad..7441cc3540 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java @@ -25,7 +25,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -510,9 +509,9 @@ public class WildBeastFarmSiege extends ClanHallSiege } final Calendar siegeStart = Calendar.getInstance(); siegeStart.setTimeInMillis(getSiegeDate().getTimeInMillis()); - final long registerTimeRemaining = siegeStart.getTimeInMillis() - Chronos.currentTimeMillis(); + final long registerTimeRemaining = siegeStart.getTimeInMillis() - System.currentTimeMillis(); siegeStart.add(Calendar.HOUR, 1); - final long siegeTimeRemaining = siegeStart.getTimeInMillis() - Chronos.currentTimeMillis(); + final long siegeTimeRemaining = siegeStart.getTimeInMillis() - System.currentTimeMillis(); long remaining = registerTimeRemaining; if ((registerTimeRemaining <= 0) && !_registrationPeriod) { @@ -579,7 +578,7 @@ public class WildBeastFarmSiege extends ClanHallSiege cancel(); return; } - final long timeRemaining = _siegeEndDate.getTimeInMillis() - Chronos.currentTimeMillis(); + final long timeRemaining = _siegeEndDate.getTimeInMillis() - System.currentTimeMillis(); if (timeRemaining <= 0) { endSiege(true); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/Spawn.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/Spawn.java index 7ef9b54eaf..150dde801b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/Spawn.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/Spawn.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.TerritoryTable; import org.l2jmobius.gameserver.data.xml.WalkerRouteData; @@ -320,7 +319,7 @@ public class Spawn _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + _respawnDelay); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + _respawnDelay); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java index b593a64116..b196b040bf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +137,7 @@ public class BossZone extends ZoneType if (expirationTime == null) // legal null expirationTime entries { final long serverStartTime = GameServer.dateTimeServerStarted.getTimeInMillis(); - if (serverStartTime > (Chronos.currentTimeMillis() - _timeInvade)) + if (serverStartTime > (System.currentTimeMillis() - _timeInvade)) { return; } @@ -148,7 +147,7 @@ public class BossZone extends ZoneType // legal non-null logoutTime entries _playerAllowedReEntryTimes.remove(creature.getObjectId()); - if (expirationTime.longValue() > Chronos.currentTimeMillis()) + if (expirationTime.longValue() > System.currentTimeMillis()) { return; } @@ -205,7 +204,7 @@ public class BossZone extends ZoneType if (!player.isOnline() && _playersAllowed.contains(creature.getObjectId())) { // mark the time that the player left the zone - _playerAllowedReEntryTimes.put(creature.getObjectId(), Chronos.currentTimeMillis() + _timeInvade); + _playerAllowedReEntryTimes.put(creature.getObjectId(), System.currentTimeMillis() + _timeInvade); } } } @@ -304,7 +303,7 @@ public class BossZone extends ZoneType { _playersAllowed.add(player.getObjectId()); } - _playerAllowedReEntryTimes.put(player.getObjectId(), Chronos.currentTimeMillis() + (durationInSec * 1000)); + _playerAllowedReEntryTimes.put(player.getObjectId(), System.currentTimeMillis() + (durationInSec * 1000)); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java index 1f795a50f1..d4f1fd8b16 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java @@ -36,7 +36,6 @@ import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.SkillTable; @@ -319,7 +318,7 @@ public class GameClient extends ChannelInboundHandler else { statement = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?"); - statement.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + statement.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 statement.setInt(2, objectId); statement.execute(); statement.close(); @@ -681,7 +680,7 @@ public class GameClient extends ChannelInboundHandler if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } OfflineTraderTable.getInstance().storeOffliner(player); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 1a35d3a086..722973331a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -88,7 +87,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 27be462760..fb72788930 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -66,7 +65,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java index 672a739193..13f5974d6e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java @@ -50,7 +50,7 @@ public class DlgAnswer implements IClientIncomingPacket } // final Long answerTime = player.getConfirmDlgRequestTime(_requesterId); - // if ((_answer == 1) && (answerTime != null) && (Chronos.currentTimeMillis() > answerTime)) + // if ((_answer == 1) && (answerTime != null) && (System.currentTimeMillis() > answerTime)) // { // _answer = 0; // } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 3c78f796e8..ac332e2c02 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -26,7 +26,6 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.MailBBSManager; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -348,7 +347,7 @@ public class EnterWorld implements IClientIncomingPacket DimensionalRiftManager.getInstance().teleportToWaitingRoom(player); } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } @@ -609,7 +608,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.SERVER_TIME_ON_START) { - player.sendMessage("SVR time is " + fmt.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("SVR time is " + fmt.format(new Date(System.currentTimeMillis()))); } // EnterWorld has finished. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 45f2d15969..e942457677 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Creature; @@ -132,7 +131,7 @@ public class Logout implements IClientIncomingPacket if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } return; } @@ -144,7 +143,7 @@ public class Logout implements IClientIncomingPacket if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index c716bb0760..315cd313c8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -69,7 +68,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.DURING_THE_GRACE_PERIOD_FOR_DISSOLVING_A_CLAN_THE_REGISTRATION_OR_DELETION_OF_A_CLAN_S_CREST_IS_NOT_ALLOWED); return; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index 9edc795b5f..b0232a13ba 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -68,7 +67,7 @@ public class RequestJoinSiege implements IClientIncomingPacket if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < player.getClan().getDissolvingExpiryTime()) + if (System.currentTimeMillis() < player.getClan().getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; @@ -100,7 +99,7 @@ public class RequestJoinSiege implements IClientIncomingPacket if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < player.getClan().getDissolvingExpiryTime()) + if (System.currentTimeMillis() < player.getClan().getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 4cc2a180a3..9e0bec2b90 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -81,8 +80,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(_target, Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // Like L2OFF also player takes the penality - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(_target, System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // Like L2OFF also player takes the penality + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 34bc35bacd..ecb2835993 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -74,7 +73,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.DURING_THE_GRACE_PERIOD_FOR_DISSOLVING_A_CLAN_THE_REGISTRATION_OR_DELETION_OF_A_CLAN_S_CREST_IS_NOT_ALLOWED); return; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 180f82210d..400926dc61 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -62,7 +61,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getName(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getName(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java index 44ce743efa..b26df090de 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java @@ -24,7 +24,6 @@ import java.util.List; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -159,7 +158,7 @@ public class CharSelectInfo implements IClientOutgoingPacket int deletedays = 0; if (deleteTime > 0) { - deletedays = (int) ((deleteTime - Chronos.currentTimeMillis()) / 1000); + deletedays = (int) ((deleteTime - System.currentTimeMillis()) / 1000); } else if (accesslevels < 0) { @@ -236,7 +235,7 @@ public class CharSelectInfo implements IClientOutgoingPacket final int objectId = chardata.getInt("charId"); // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Player cha = Player.load(objectId); final Clan clan = cha.getClan(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index c3b2a52d0d..1ba97297db 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -54,7 +53,7 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getHideoutId()); packet.writeD(0); packet.writeD(_player.getLevel()); - packet.writeD(_clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis() ? 3 : 0); + packet.writeD(_clan.getDissolvingExpiryTime() > System.currentTimeMillis() ? 3 : 0); packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index e74c07fba5..0e7c37abaa 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -49,7 +48,7 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket packet.writeD(_member.getClan().getHideoutId()); packet.writeD(0); packet.writeD(_player.getLevel()); // ?? - packet.writeD(_member.getClan().getDissolvingExpiryTime() > Chronos.currentTimeMillis() ? 3 : 0); + packet.writeD(_member.getClan().getDissolvingExpiryTime() > System.currentTimeMillis() ? 3 : 0); packet.writeD(0); packet.writeD(_member.getClan().getAllyId()); packet.writeS(_member.getClan().getAllyName()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 197fc38d39..227139581b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -47,7 +46,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket packet.writeD(_clan.getHideoutId()); packet.writeD(0); packet.writeD(_player.getLevel()); // ?? - packet.writeD(_clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis() ? 3 : 0); + packet.writeD(_clan.getDissolvingExpiryTime() > System.currentTimeMillis() ? 3 : 0); packet.writeD(0); packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index baa62f37f6..0369261264 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index 38af9c2d97..1e0b52aa87 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Cubic; @@ -57,7 +56,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -112,7 +111,7 @@ public class AttackStanceTaskManager implements Runnable } } } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index f08db08286..2cae4c1467 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.TradeManager; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingTimes = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : REFRESH_TIME.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -113,7 +112,7 @@ public class BuyListTaskManager PENDING_UPDATES.add(time); } } - REFRESH_TIME.put(time, Chronos.currentTimeMillis() + (timeValue * 60 * 60 * 1000L)); + REFRESH_TIME.put(time, System.currentTimeMillis() + (timeValue * 60 * 60 * 1000L)); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 4a4329d4a4..1aa150d95c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; @@ -44,7 +43,7 @@ public class DecayTaskManager implements Runnable @Override public void run() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); int delay; try { @@ -78,12 +77,12 @@ public class DecayTaskManager implements Runnable public void addDecayTask(Creature actor) { - _decayTasks.put(actor, Chronos.currentTimeMillis()); + _decayTasks.put(actor, System.currentTimeMillis()); } public void addDecayTask(Creature actor, int interval) { - _decayTasks.put(actor, Chronos.currentTimeMillis() + interval); + _decayTasks.put(actor, System.currentTimeMillis() + interval); } public void cancelDecayTask(Creature actor) @@ -104,7 +103,7 @@ public class DecayTaskManager implements Runnable ret += "Tasks count: " + _decayTasks.size() + "\r\n"; ret += "Tasks dump:\r\n"; - final Long current = Chronos.currentTimeMillis(); + final Long current = System.currentTimeMillis(); for (Creature actor : _decayTasks.keySet()) { ret += "Class/Name: " + actor.getClass().getSimpleName() + "/" + actor.getName() + " decay timer: " + (current - _decayTasks.get(actor)) + "\r\n"; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 5c5f3c8602..f55f679827 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -26,7 +26,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager; import org.l2jmobius.gameserver.model.actor.Creature; @@ -53,7 +52,7 @@ public class GameTimeTaskManager protected GameTimeTaskManager() { - _gameStartTime = Chronos.currentTimeMillis() - 3600000; // offset so that the server starts a day begin + _gameStartTime = System.currentTimeMillis() - 3600000; // offset so that the server starts a day begin _gameTicks = 3600000 / MILLIS_IN_TICK; // offset so that the server starts a day begin _timer = new TimerThread(); @@ -162,7 +161,7 @@ public class GameTimeTaskManager for (;;) { final int _oldTicks = _gameTicks; // save old ticks value to avoid moving objects 2x in same tick - long runtime = Chronos.currentTimeMillis() - _gameStartTime; // from server boot to now + long runtime = System.currentTimeMillis() - _gameStartTime; // from server boot to now _gameTicks = (int) (runtime / MILLIS_IN_TICK); // new ticks value (ticks now) @@ -174,7 +173,7 @@ public class GameTimeTaskManager // (will happen very rarely but it will happen ... on garbage collection definitely) } - runtime = Chronos.currentTimeMillis() - _gameStartTime - runtime; + runtime = System.currentTimeMillis() - _gameStartTime - runtime; // calculate sleep time... time needed to next tick minus time it takes to call moveObjects() final int sleepTime = (1 + MILLIS_IN_TICK) - ((int) runtime % MILLIS_IN_TICK); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 9fea22be87..3a0b043763 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -22,7 +22,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.World; @@ -47,7 +46,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item == null) || (item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -70,7 +69,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 76583bc59e..a42495a496 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 2fc437cf6d..b35ccf6120 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.isRandomAnimationEnabled()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 6da0fb5ece..7d1c263024 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.spawn.Spawn; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 10f6a14c08..e8146a4e71 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -40,7 +40,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskOlympiadSave; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRaidPointsReset; @@ -94,7 +93,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection()) { @@ -258,7 +257,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -305,7 +304,7 @@ public class TaskManager return false; } - long delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + long delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { delay += interval; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 577f4885c9..8714cd200c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -148,7 +147,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/MinionList.java index 0a2d3b8ef7..368c8fe8a5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/MinionList.java @@ -24,7 +24,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -98,7 +97,7 @@ public class MinionList public void moveMinionToRespawnList(Minion minion) { - final Long current = Chronos.currentTimeMillis(); + final Long current = System.currentTimeMillis(); _spawnedMinions.remove(minion); if (_respawnTasks.get(current) == null) { @@ -145,7 +144,7 @@ public class MinionList return; } - final Long current = Chronos.currentTimeMillis(); + final Long current = System.currentTimeMillis(); if (_respawnTasks != null) { for (Entry entry : _respawnTasks.entrySet()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/FloodProtectedListener.java index 6be2cdabce..3a61f685df 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -70,9 +69,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; @@ -91,11 +90,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java index 09ebaf650d..98273dca77 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginController.java @@ -38,7 +38,6 @@ import javax.crypto.Cipher; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.loginserver.network.LoginClient; @@ -311,7 +310,7 @@ public class LoginController { statement.setString(1, user); statement.setString(2, Base64.getEncoder().encodeToString(hash)); - statement.setLong(3, Chronos.currentTimeMillis()); + statement.setLong(3, System.currentTimeMillis()); statement.setInt(4, 0); statement.setString(5, address.getHostAddress()); statement.execute(); @@ -342,7 +341,7 @@ public class LoginController client.setLastServer(lastServer); try (PreparedStatement statement = con.prepareStatement("UPDATE accounts SET lastactive=?, lastIP=? WHERE login=?")) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); statement.setString(2, address.getHostAddress()); statement.setString(3, user); statement.execute(); @@ -380,7 +379,7 @@ public class LoginController if (failedCount >= Config.LOGIN_TRY_BEFORE_BAN) { LOGGER.info("Banning '" + address.getHostAddress() + "' for " + Config.LOGIN_BLOCK_AFTER_BAN + " seconds due to " + failedCount + " invalid user/pass attempts"); - addBanForAddress(address.getHostAddress(), Chronos.currentTimeMillis() + (Config.LOGIN_BLOCK_AFTER_BAN * 1000)); + addBanForAddress(address.getHostAddress(), System.currentTimeMillis() + (Config.LOGIN_BLOCK_AFTER_BAN * 1000)); } } else @@ -449,7 +448,7 @@ public class LoginController public boolean hasExpired() { - return (Chronos.currentTimeMillis() > _time) && (_time > 0); + return (System.currentTimeMillis() > _time) && (_time > 0); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java index 6197fa0edd..d51dfb3a78 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java @@ -47,7 +47,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.Shutdown; import org.l2jmobius.gameserver.cache.HtmCache; @@ -957,7 +956,7 @@ public class GameStatusThread extends Thread private String getUptime(int time) { - int uptime = (int) Chronos.currentTimeMillis() - time; + int uptime = (int) System.currentTimeMillis() - time; uptime = uptime / 1000; final int h = uptime / 3600; final int m = (uptime - (h * 3600)) / 60; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/TelnetStatusThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/TelnetStatusThread.java index 7c21bca02a..674180ba36 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/TelnetStatusThread.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/TelnetStatusThread.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; public class TelnetStatusThread extends Thread @@ -125,7 +124,7 @@ public class TelnetStatusThread extends Thread } statusServerSocket = new ServerSocket(_statusPort); - _uptime = (int) Chronos.currentTimeMillis(); + _uptime = (int) System.currentTimeMillis(); _loginStatus = new ArrayList<>(); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java index d9d857e0db..18d4848f21 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java @@ -24,7 +24,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -212,7 +211,7 @@ public class Antharas extends Quest { final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARAS_OLD); final Long respawnTime = info.getLong("respawn_time"); - if ((status == DEAD) && (respawnTime <= Chronos.currentTimeMillis())) + if ((status == DEAD) && (respawnTime <= System.currentTimeMillis())) { // The time has already expired while the server was offline. Immediately spawn antharas in his cave. // Also, the status needs to be changed to DORMANT. @@ -230,13 +229,13 @@ public class Antharas extends Quest _antharas = (GrandBoss) addSpawn(ANTHARAS_OLD, x, y, z, heading, false, 0); GrandBossManager.getInstance().addBoss(_antharas); _antharas.setCurrentHpMp(hp, mp); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Start repeating timer to check for inactivity. _activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000); } else if (status == DEAD) { - ThreadPool.schedule(new UnlockAntharas(ANTHARAS_OLD), respawnTime - Chronos.currentTimeMillis()); + ThreadPool.schedule(new UnlockAntharas(ANTHARAS_OLD), respawnTime - System.currentTimeMillis()); } else if (status == DORMANT) { @@ -280,7 +279,7 @@ public class Antharas extends Quest _antharas = (GrandBoss) addSpawn(antharasId, loc_x, loc_y, loc_z, heading, false, 0); GrandBossManager.getInstance().addBoss(_antharas); _antharas.setCurrentHpMp(hp, mp); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Start repeating timer to check for inactivity. _activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000); } @@ -288,7 +287,7 @@ public class Antharas extends Quest { final StatSet info = GrandBossManager.getInstance().getStatSet(antharasId); final Long respawnTime = info.getLong("respawn_time"); - if (respawnTime <= Chronos.currentTimeMillis()) + if (respawnTime <= System.currentTimeMillis()) { // The time has already expired while the server was offline. Immediately spawn antharas in his cave. // Also, the status needs to be changed to DORMANT. @@ -297,7 +296,7 @@ public class Antharas extends Quest } else { - ThreadPool.schedule(new UnlockAntharas(antharasId), respawnTime - Chronos.currentTimeMillis()); + ThreadPool.schedule(new UnlockAntharas(antharasId), respawnTime - System.currentTimeMillis()); } } } @@ -421,7 +420,7 @@ public class Antharas extends Quest _antharas.setImmobilized(true); GrandBossManager.getInstance().setBossStatus(ANTHARAS_OLD, DORMANT); GrandBossManager.getInstance().setBossStatus(npcId, FIGHTING); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); // Start repeating timer to check for inactivity. _activityCheckTask = ThreadPool.scheduleAtFixedRate(new CheckActivity(), 60000, 60000); // Setting 1st time of minions spawn task. @@ -708,7 +707,7 @@ public class Antharas extends Quest @Override public void run() { - final Long temp = (Chronos.currentTimeMillis() - _lastAction); + final Long temp = (System.currentTimeMillis() - _lastAction); if (temp > (Config.ANTHARAS_DESPAWN_TIME * 60000)) { GrandBossManager.getInstance().setBossStatus(_antharas.getNpcId(), DORMANT); @@ -874,7 +873,7 @@ public class Antharas extends Quest { if ((npc.getNpcId() == ANTHARAS_OLD) || (npc.getNpcId() == ANTHARAS_WEAK) || (npc.getNpcId() == ANTHARAS_NORMAL) || (npc.getNpcId() == ANTHARAS_STRONG)) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (!FWA_OLDANTHARAS && (_mobsSpawnTask == null)) { startMinionSpawns(npc.getNpcId()); @@ -918,7 +917,7 @@ public class Antharas extends Quest ThreadPool.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(npc.getNpcId()); - info.set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); GrandBossManager.getInstance().setStatSet(npc.getNpcId(), info); } else if (npc.getNpcId() == 29069) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java index 79ed7a3e0a..6b96934f27 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -108,7 +107,7 @@ public class Baium extends Quest if (status == DEAD) { // Load the unlock date and time for baium from DB. - final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); if (temp > 0) { // The unlock time has not yet expired. Mark Baium as currently locked (dead). @@ -178,7 +177,7 @@ public class Baium extends Quest npc.broadcastPacket(new Earthquake(npc.getX(), npc.getY(), npc.getZ(), 40, 5)); // Start monitoring baium's inactivity. - _lastAttackVsBaiumTime = Chronos.currentTimeMillis(); + _lastAttackVsBaiumTime = System.currentTimeMillis(); startQuestTimer("baium_despawn", 60000, npc, null, true); if (player != null) { @@ -225,7 +224,7 @@ public class Baium extends Quest { _zone = GrandBossManager.getInstance().getZone(113100, 14500, 10077); } - if ((_lastAttackVsBaiumTime + (Config.BAIUM_SLEEP * 1000)) < Chronos.currentTimeMillis()) + if ((_lastAttackVsBaiumTime + (Config.BAIUM_SLEEP * 1000)) < System.currentTimeMillis()) { npc.deleteMe(); // Despawn the live-baium. for (Npc minion : _minions) @@ -242,7 +241,7 @@ public class Baium extends Quest _zone.oustAllPlayers(); cancelQuestTimer("baium_despawn", npc, null); } - else if (((_lastAttackVsBaiumTime + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0))) + else if (((_lastAttackVsBaiumTime + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0))) { npc.setTarget(npc); npc.doCast(SkillTable.getInstance().getSkill(4135, 1)); @@ -371,7 +370,7 @@ public class Baium extends Quest } } // Update a variable with the last action against Baium. - _lastAttackVsBaiumTime = Chronos.currentTimeMillis(); + _lastAttackVsBaiumTime = System.currentTimeMillis(); callSkillAI(npc); } return super.onAttack(npc, attacker, damage, isPet); @@ -390,7 +389,7 @@ public class Baium extends Quest startQuestTimer("baium_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(LIVE_BAIUM, info); for (Npc minion : _minions) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java index a7f885a373..c3955934db 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java @@ -18,7 +18,6 @@ package ai.bosses; import java.util.Collection; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.ChatType; @@ -142,9 +141,9 @@ public class Benom extends Quest final int castleOwner = CastleManager.getInstance().getCastleById(8).getOwnerId(); final long siegeDate = CastleManager.getInstance().getCastleById(8).getSiegeDate().getTimeInMillis(); - long benomTeleporterSpawn = (siegeDate - Chronos.currentTimeMillis()) - 86400000; - final long benomRaidRoomSpawn = (siegeDate - Chronos.currentTimeMillis()) - 86400000; - long benomRaidSiegeSpawn = (siegeDate - Chronos.currentTimeMillis()); + long benomTeleporterSpawn = (siegeDate - System.currentTimeMillis()) - 86400000; + final long benomRaidRoomSpawn = (siegeDate - System.currentTimeMillis()) - 86400000; + long benomRaidSiegeSpawn = (siegeDate - System.currentTimeMillis()); if (benomTeleporterSpawn < 0) { benomTeleporterSpawn = 1; @@ -159,7 +158,7 @@ public class Benom extends Quest { startQuestTimer("BenomTeleSpawn", benomTeleporterSpawn, null, null); } - if ((siegeDate - Chronos.currentTimeMillis()) > 0) + if ((siegeDate - System.currentTimeMillis()) > 0) { startQuestTimer("BenomRaidRoomSpawn", benomRaidRoomSpawn, null, null); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java index 1e79df2164..ea963ff60f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -103,7 +102,7 @@ public class Core extends Quest if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -223,7 +222,7 @@ public class Core extends Quest startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java index 959579ebfc..d336647995 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -289,7 +288,7 @@ public class Frintezza extends Quest final Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA); if (status == DEAD) { - final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); if (temp > 0) { startQuestTimer("frintezza_unlock", temp, null, null); @@ -1375,7 +1374,7 @@ public class Frintezza extends Quest } case "frintezza_despawn": { - if ((Chronos.currentTimeMillis() - _lastAction) > 900000) + if ((System.currentTimeMillis() - _lastAction) > 900000) { _zone.oustAllPlayers(); cancelQuestTimers("waiting"); @@ -1503,7 +1502,7 @@ public class Frintezza extends Quest startQuestTimer("room1_spawn", 5000, npc, null); startQuestTimer("room_final", 2100000, npc, null); startQuestTimer("frintezza_despawn", 60000, npc, null); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (Config.BYPASS_FRINTEZZA_PARTIES_CHECK) { if (player.getParty() != null) @@ -1660,7 +1659,7 @@ public class Frintezza extends Quest @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isPet) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.getNpcId() == FRINTEZZA) { npc.setCurrentHpMp(npc.getMaxHp(), 0); @@ -1743,7 +1742,7 @@ public class Frintezza extends Quest startQuestTimer("frintezza_unlock", respawnTime, npc, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(FRINTEZZA, info); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java index e243b43fee..62d389ae13 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java @@ -17,7 +17,6 @@ package ai.bosses; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -64,7 +63,7 @@ public class Orfen extends Quest { case DEAD: { - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("ORFEN_SPAWN", temp, null, null); @@ -218,7 +217,7 @@ public class Orfen extends Quest startQuestTimer("ORFEN_SPAWN", respawnTime, null, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); } return super.onKill(npc, killer, isPet); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java index 5f6ebf54f2..61f9b693c2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -92,7 +91,7 @@ public class QueenAnt extends Quest { case DEAD: { - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("QUEEN_SPAWN", temp, null, null); @@ -352,7 +351,7 @@ public class QueenAnt extends Quest // cancelQuestTimer("CHECK_QA_ZONE", npc, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); startQuestTimer("DESPAWN_MINIONS", 10000, null, null); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java index 8abf66d71a..cc638ca1e5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -84,7 +83,7 @@ public class Valakas extends Quest i_ai3 = 0; i_ai4 = 0; i_quest0 = 0; - lastAttackTime = Chronos.currentTimeMillis(); + lastAttackTime = System.currentTimeMillis(); _zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632); final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); @@ -92,7 +91,7 @@ public class Valakas extends Quest if (status == DEAD) { // Load the unlock date and time for valakas from DB. - final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); // If valakas is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. // Mark valakas as currently locked. Setup a timer to fire at the correct time (calculate the time between now and the unlock time, setup a timer to fire after that many msec). if (temp > 0) @@ -158,7 +157,7 @@ public class Valakas extends Quest } } final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS); - if ((status == FIGHTING) && ((Chronos.currentTimeMillis() - lastAttackTime) > (Config.VALAKAS_DESPAWN_TIME * 60000))) // 15 mins by default. + if ((status == FIGHTING) && ((System.currentTimeMillis() - lastAttackTime) > (Config.VALAKAS_DESPAWN_TIME * 60000))) // 15 mins by default. { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); @@ -340,7 +339,7 @@ public class Valakas extends Quest final GrandBoss valakas = (GrandBoss) addSpawn(VALAKAS, loc_x, loc_y, loc_z, heading, false, 0); GrandBossManager.getInstance().addBoss(valakas); - lastAttackTime = Chronos.currentTimeMillis(); + lastAttackTime = System.currentTimeMillis(); ThreadPool.schedule(() -> { try @@ -375,7 +374,7 @@ public class Valakas extends Quest return null; } - lastAttackTime = Chronos.currentTimeMillis(); + lastAttackTime = System.currentTimeMillis(); // if (!Config.ALLOW_DIRECT_TP_TO_BOSS_ROOM && GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING && !npc.getSpawn().isCustomBossInstance()) { attacker.teleToLocation(150037, -57255, -2976); } if (attacker.getMountType() == 1) { @@ -595,7 +594,7 @@ public class Valakas extends Quest startQuestTimer("valakas_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past restarts. final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isPet); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java index 7777a3f83d..0bd22e515a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -1252,13 +1251,13 @@ public class VanHalter extends Quest { final long interval = getRandom(Config.HPH_FIXINTERVALOFHALTER, Config.HPH_FIXINTERVALOFHALTER + Config.HPH_RANDOMINTERVALOFHALTER)/* * 3600000 */; final StatSet info = GrandBossManager.getInstance().getStatSet(29062); - info.set("respawn_time", (Chronos.currentTimeMillis() + interval)); + info.set("respawn_time", (System.currentTimeMillis() + interval)); GrandBossManager.getInstance().setStatSet(29062, info); GrandBossManager.getInstance().setBossStatus(29062, INTERVAL); } final StatSet info = GrandBossManager.getInstance().getStatSet(29062); - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); _intervalTask = ThreadPool.schedule(new Interval(), temp); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java index d9984c5ddf..ea3912fe60 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -169,7 +168,7 @@ public class Zaken extends Quest if (status == DEAD) { // Load the unlock date and time for zaken from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Zaken is locked until a certain time, mark it so and start the unlock timer. // The unlock time has not yet expired. if (temp > 0) @@ -840,7 +839,7 @@ public class Zaken extends Quest cancelQuestTimer("1003", npc, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); } else if (status == ALIVE) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java index 3bab9a4ab3..b576beb4be 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -30,7 +30,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -143,7 +142,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -478,7 +477,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java index c4895a33b0..fe4b2163f2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java @@ -20,7 +20,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.WalkerRouteData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.NpcWalkerNode; @@ -92,7 +91,7 @@ public class NpcWalkerAI extends CreatureAI implements Runnable return; } - if (_nextMoveTime < Chronos.currentTimeMillis()) + if (_nextMoveTime < System.currentTimeMillis()) { walkToLocation(); } @@ -155,7 +154,7 @@ public class NpcWalkerAI extends CreatureAI implements Runnable delay = DEFAULT_MOVE_DELAY; } - _nextMoveTime = Chronos.currentTimeMillis() + delay; + _nextMoveTime = System.currentTimeMillis() + delay; setWalkingToNextPoint(false); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index e26360e9e3..9626585aae 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -42,7 +41,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - _cachedWh.put(pc, Chronos.currentTimeMillis()); + _cachedWh.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -55,7 +54,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : _cachedWh.entrySet()) { if ((cTime - entry.getValue().longValue()) > _cacheTime) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 0d47f3b724..5ce3195542 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -30,7 +30,6 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -81,7 +80,7 @@ public class ClanTable clan = getClan(Integer.parseInt(result.getString("clan_id"))); if (clan.getDissolvingExpiryTime() != 0) { - if (clan.getDissolvingExpiryTime() < Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() < System.currentTimeMillis()) { destroyClan(clan.getClanId()); } @@ -180,7 +179,7 @@ public class ClanTable return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -409,7 +408,7 @@ public class ClanTable { destroyClan(clanId); } - }, getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis()); + }, getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis()); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index 8c1ab51f07..7adff6b58d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.ManufactureList; @@ -178,7 +177,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java index 8edfcf9217..020ebea4bf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -158,7 +157,7 @@ public class TradeListTable { int time = 0; long savetimer = 0; - final long currentMillis = Chronos.currentTimeMillis(); + final long currentMillis = System.currentTimeMillis(); final PreparedStatement statement2 = con.prepareStatement("SELECT DISTINCT time, savetimer FROM " + (custom ? "custom_merchant_buylists" : "merchant_buylists") + " WHERE time <> 0 ORDER BY time"); final ResultSet rset2 = statement2.executeQuery(); @@ -168,7 +167,7 @@ public class TradeListTable savetimer = rset2.getLong("savetimer"); if ((savetimer - currentMillis) > 0) { - ThreadPool.schedule(new RestoreCount(time), savetimer - Chronos.currentTimeMillis()); + ThreadPool.schedule(new RestoreCount(time), savetimer - System.currentTimeMillis()); } else { @@ -223,7 +222,7 @@ public class TradeListTable protected void dataTimerSave(int time) { - final long timerSave = Chronos.currentTimeMillis() + (time * 3600000); // 60*60*1000 + final long timerSave = System.currentTimeMillis() + (time * 3600000); // 60*60*1000 try (Connection con = DatabaseFactory.getConnection()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCursedWeapons.java index 1fdeaeac7b..46d820a026 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCursedWeapons.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; 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; @@ -239,7 +238,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler else { // end time is equal to dropped one - final long endTime = Chronos.currentTimeMillis() + (cursedWeapon.getDuration() * 60000); + final long endTime = System.currentTimeMillis() + (cursedWeapon.getDuration() * 60000); cursedWeapon.setEndTime(endTime); final WorldObject target = activeChar.getTarget(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java index de1c064eac..1c4a1dcaeb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; @@ -62,7 +61,7 @@ public class AdminDonator implements IAdminCommandHandler { targetPlayer.setDonator(true); targetPlayer.updateNameTitleColor(); - targetPlayer.getVariables().set("CustomDonatorEnd", Chronos.currentTimeMillis() + donatorTime); + targetPlayer.getVariables().set("CustomDonatorEnd", System.currentTimeMillis() + donatorTime); targetPlayer.sendMessage(activeChar.getName() + " has granted you donator status!"); activeChar.sendMessage("You have granted donator status to " + targetPlayer.getName()); AdminData.broadcastMessageToGMs("Warn: " + activeChar.getName() + " has set " + targetPlayer.getName() + " as donator !"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminServerInfo.java index 865d193398..1c5887ce1a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java index 8ae65233c2..a86c888316 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +65,7 @@ public class HeroCustomItem implements IItemHandler final long heroTime = Config.HERO_CUSTOM_DAY * 24 * 60 * 60 * 1000; player.getVariables().set("CustomHero", true); - player.getVariables().set("CustomHeroEnd", heroTime == 0 ? 0 : Chronos.currentTimeMillis() + heroTime); + player.getVariables().set("CustomHeroEnd", heroTime == 0 ? 0 : System.currentTimeMillis() + heroTime); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java index 502e524e27..f9d1ada082 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.handler.itemhandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.WorldObject; @@ -72,7 +71,7 @@ public class MOSKey implements IItemHandler return; } - if ((_lastOpen + 1800000) > Chronos.currentTimeMillis()) // 30 * 60 * 1000 = 1800000 + if ((_lastOpen + 1800000) > System.currentTimeMillis()) // 30 * 60 * 1000 = 1800000 { player.sendMessage("You can`t use the key right now."); player.sendPacket(ActionFailed.STATIC_PACKET); @@ -91,7 +90,7 @@ public class MOSKey implements IItemHandler DoorData.getInstance().getDoor(23150003).onOpen(); DoorData.getInstance().getDoor(23150004).onOpen(); player.broadcastPacket(new SocialAction(player.getObjectId(), 3)); - _lastOpen = Chronos.currentTimeMillis(); + _lastOpen = System.currentTimeMillis(); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ClanPenalty.java index 6d8537f876..fab2bd3489 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.handler.usercommandhandlers; import java.text.SimpleDateFormat; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -50,19 +49,19 @@ public class ClanPenalty implements IUserCommandHandler htmlContent.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); htmlContent.append(""); penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); htmlContent.append(""); penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append(""); htmlContent.append("
Unable to join a clan." + format.format(player.getClanJoinExpiryTime()) + "Unable to create a clan." + format.format(player.getClanCreateExpiryTime()) + "Unable to invite a clan member."); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index d194f619b5..9b9f696f9a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -372,7 +371,7 @@ public class CursedWeaponsManager SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addNumber((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addNumber((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); sm = new SystemMessage(SystemMessageId.THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java index 5f5430c837..2088088774 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; @@ -61,14 +60,14 @@ public class FishingChampionshipManager refreshWinResult(); recalculateMinLength(); - if (_enddate <= Chronos.currentTimeMillis()) + if (_enddate <= System.currentTimeMillis()) { - _enddate = Chronos.currentTimeMillis(); + _enddate = System.currentTimeMillis(); new finishChamp().run(); } else { - ThreadPool.schedule(new finishChamp(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new finishChamp(), _enddate - System.currentTimeMillis()); } } @@ -195,7 +194,7 @@ public class FishingChampionshipManager public long getTimeRemaining() { - return (_enddate - Chronos.currentTimeMillis()) / 60000; + return (_enddate - System.currentTimeMillis()) / 60000; } public String getWinnerName(int par) @@ -472,7 +471,7 @@ public class FishingChampionshipManager shutdown(); LOGGER.info("FishingChampionshipManager: new event period start."); - ThreadPool.schedule(new finishChamp(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new finishChamp(), _enddate - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 998c980293..0590b0cfe9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -81,7 +80,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -126,7 +125,7 @@ public class IdManager cleanCount += statement.executeUpdate("DELETE FROM items WHERE items.owner_id NOT IN (SELECT charId FROM characters) AND items.owner_id NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE characters SET clanid=0 WHERE characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -141,7 +140,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index b01ece23b1..13475aab1f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -96,7 +95,7 @@ public class ItemsOnGroundManager } final PreparedStatement statement = con.prepareStatement(str); - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); statement.execute(); statement.close(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index 7abc2ddfbf..2e10a6bd8a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.actor.Player; @@ -74,7 +73,7 @@ public class PetitionManager private class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java index ae3161fc71..9b53343a82 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -181,7 +180,7 @@ public class TradeManager { int time = 0; long savetimer = 0; - final long currentMillis = Chronos.currentTimeMillis(); + final long currentMillis = System.currentTimeMillis(); final PreparedStatement statement2 = con.prepareStatement("SELECT DISTINCT time, savetimer FROM merchant_buylists WHERE time <> 0 ORDER BY time"); final ResultSet rset2 = statement2.executeQuery(); @@ -342,7 +341,7 @@ public class TradeManager { int time = 0; long savetimer = 0; - final long currentMillis = Chronos.currentTimeMillis(); + final long currentMillis = System.currentTimeMillis(); final PreparedStatement statement2 = con.prepareStatement("SELECT DISTINCT time, savetimer FROM custom_merchant_buylists WHERE time <> 0 ORDER BY time"); final ResultSet rset2 = statement2.executeQuery(); @@ -428,7 +427,7 @@ public class TradeManager public void dataTimerSave(int time) { - final long timerSave = Chronos.currentTimeMillis() + (time * 60 * 60 * 1000); + final long timerSave = System.currentTimeMillis() + (time * 60 * 60 * 1000); try (Connection con = DatabaseFactory.getConnection()) { final PreparedStatement statement = con.prepareStatement("UPDATE merchant_buylists SET savetimer=? WHERE time=?"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/EventsGlobalTask.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/EventsGlobalTask.java index 933879cd42..856b30737e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/EventsGlobalTask.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/events/EventsGlobalTask.java @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; /** * @author Shyla @@ -163,7 +162,7 @@ public class EventsGlobalTask implements Runnable } final Calendar calendar = Calendar.getInstance(); - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); final int hour = calendar.get(Calendar.HOUR_OF_DAY); final int min = calendar.get(Calendar.MINUTE); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index 6e9aa02c2c..eb2f142d3a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -60,7 +59,7 @@ public class Lottery _prize = Config.ALT_LOTTERY_PRIZE; _isSellingTickets = false; _isStarted = false; - _enddate = Chronos.currentTimeMillis(); + _enddate = System.currentTimeMillis(); if (Config.ALLOW_LOTTERY) { new startLottery().run(); @@ -137,7 +136,7 @@ public class Lottery { _prize = rset.getInt("prize"); _enddate = rset.getLong("enddate"); - if (_enddate <= (Chronos.currentTimeMillis() + (2 * MINUTE))) + if (_enddate <= (System.currentTimeMillis() + (2 * MINUTE))) { new finishLottery().run(); rset.close(); @@ -146,14 +145,14 @@ public class Lottery return; } - if (_enddate > Chronos.currentTimeMillis()) + if (_enddate > System.currentTimeMillis()) { _isStarted = true; - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); - if (_enddate > (Chronos.currentTimeMillis() + (12 * MINUTE))) + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); + if (_enddate > (System.currentTimeMillis() + (12 * MINUTE))) { _isSellingTickets = true; - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); } rset.close(); statement.close(); @@ -190,8 +189,8 @@ public class Lottery _enddate = finishtime.getTimeInMillis(); } - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); try (Connection con = DatabaseFactory.getConnection()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java index d4690d8044..fae94a43a6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -24,7 +24,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -196,7 +195,7 @@ public class CursedWeapon @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -303,7 +302,7 @@ public class CursedWeapon public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -321,7 +320,7 @@ public class CursedWeapon dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -604,7 +603,7 @@ public class CursedWeapon public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public int getDuration() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Timestamp.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Timestamp.java index c4828b98c3..9f9ed44eec 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Timestamp.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Timestamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; /** * Simple class containing all necessary information to maintain
@@ -34,7 +33,7 @@ public class Timestamp { _skill = skill; _reuse = reuse; - _stamp = Chronos.currentTimeMillis() + _reuse; + _stamp = System.currentTimeMillis() + _reuse; } public Timestamp(Skill skill, long reuse, long stamp) @@ -99,7 +98,7 @@ public class Timestamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -117,7 +116,7 @@ public class Timestamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index c636bb26ea..fca9015e32 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -409,7 +408,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastToChannelMembers(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -418,7 +417,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } @@ -3053,7 +3052,7 @@ public class Attackable extends Npc @Override public void run() { - if ((Chronos.currentTimeMillis() - _monster.getCommandChannelLastAttack()) > 900000) + if ((System.currentTimeMillis() - _monster.getCommandChannelLastAttack()) > 900000) { _monster.setCommandChannelTimer(null); _monster.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 54812cf4ba..68843f6202 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -8626,12 +8625,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder public void reduceCurrentHpByDamOverTime(double amount, Creature attacker, boolean awake, int period) { - if (_nextReducingHPByOverTime > Chronos.currentTimeMillis()) + if (_nextReducingHPByOverTime > System.currentTimeMillis()) { return; } - _nextReducingHPByOverTime = Chronos.currentTimeMillis() + (period * 880); + _nextReducingHPByOverTime = System.currentTimeMillis() + (period * 880); reduceCurrentHp(amount, attacker, awake); } @@ -8639,12 +8638,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder public void reduceCurrentMpByDamOverTime(double amount, int period) { - if (_nextReducingMPByOverTime > Chronos.currentTimeMillis()) + if (_nextReducingMPByOverTime > System.currentTimeMillis()) { return; } - _nextReducingMPByOverTime = Chronos.currentTimeMillis() + (period * 880); + _nextReducingMPByOverTime = System.currentTimeMillis() + (period * 880); reduceCurrentMp(amount); } @@ -8998,7 +8997,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder */ public void updateAttackStance() { - attackStance = Chronos.currentTimeMillis(); + attackStance = System.currentTimeMillis(); } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java index 3f11d04587..39bb0d3f5c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; @@ -137,7 +136,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; @@ -580,7 +579,7 @@ public class Npc extends Creature @Override public void onAction(Player player) { - if (!canTarget(player) || ((Chronos.currentTimeMillis() - player.getTimerToAttack()) < Config.CLICK_TASK)) + if (!canTarget(player) || ((System.currentTimeMillis() - player.getTimerToAttack()) < Config.CLICK_TASK)) { return; } @@ -613,7 +612,7 @@ public class Npc extends Creature player.sendPacket(new MyTargetSelected(getObjectId(), 0)); } - player.setTimerToAttack(Chronos.currentTimeMillis()); + player.setTimerToAttack(System.currentTimeMillis()); // Send a Server->Client packet ValidateLocation to correct the Npc position and heading on the client player.sendPacket(new ValidateLocation(this)); } @@ -850,7 +849,7 @@ public class Npc extends Creature player.sendPacket(new MyTargetSelected(getObjectId(), 0)); } - player.setTimerToAttack(Chronos.currentTimeMillis()); + player.setTimerToAttack(System.currentTimeMillis()); player.sendPacket(new ValidateLocation(this)); } else diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index e5bd4956a9..410c48dfcd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -929,7 +928,7 @@ public class Player extends Playable } getFreight().restore(); - _instanceLoginTime = Chronos.currentTimeMillis(); + _instanceLoginTime = System.currentTimeMillis(); } /** @@ -945,7 +944,7 @@ public class Player extends Playable super.initCharStatusUpdateValues(); initPcStatusUpdateValues(); - _instanceLoginTime = Chronos.currentTimeMillis(); + _instanceLoginTime = System.currentTimeMillis(); } @Override @@ -3045,7 +3044,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } public long getOnlineTime() @@ -6328,7 +6327,7 @@ public class Player extends Playable return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (getPvpFlag() == 0) { startPvPFlag(); @@ -6370,11 +6369,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (getPvpFlag() == 0) { @@ -7116,7 +7115,7 @@ public class Player extends Playable */ public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -7437,7 +7436,7 @@ public class Player extends Playable { final PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?"); statement.setInt(1, isOnline() ? 1 : 0); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); statement.close(); @@ -7457,7 +7456,7 @@ public class Player extends Playable { final PreparedStatement statement = con.prepareStatement("UPDATE characters SET isIn7sDungeon=?, lastAccess=? WHERE charId=?"); statement.setInt(1, isIn7sDungeon() ? 1 : 0); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); statement.close(); @@ -7564,7 +7563,7 @@ public class Player extends Playable statement.setInt(54, isNewbie() ? 1 : 0); statement.setInt(55, isNoble() ? 1 : 0); statement.setLong(56, 0); - statement.setLong(57, Chronos.currentTimeMillis()); + statement.setLong(57, System.currentTimeMillis()); statement.setString(58, StringToHex(Integer.toHexString(getAppearance().getNameColor()).toUpperCase())); statement.setString(59, StringToHex(Integer.toHexString(getAppearance().getTitleColor()).toUpperCase())); statement.setInt(60, isAio() ? 1 : 0); @@ -7643,12 +7642,12 @@ public class Player extends Playable player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); player.setFirstLog(rset.getInt("first_log")); player._pcBangPoints = rset.getInt("pc_point"); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -7688,7 +7687,7 @@ public class Player extends Playable player.setTitle(rset.getString("title")); player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); curHp = rset.getDouble("curHp"); curCp = rset.getDouble("curCp"); @@ -8190,7 +8189,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(41, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(42, getPunishLevel().value()); @@ -8285,7 +8284,7 @@ public class Player extends Playable statement = con.prepareStatement(ADD_SKILL_SAVE); int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Effect effect : effects) { final int skillId = effect.getSkill().getId(); @@ -8716,7 +8715,7 @@ public class Player extends Playable { PreparedStatement statement; ResultSet rset; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Restore Type 0 These skill were still in effect on the character upon logout. Some of which were self casted and might still have had a long reuse delay which also is restored. statement = con.prepareStatement(RESTORE_SKILL_SAVE); @@ -9370,14 +9369,14 @@ public class Player extends Playable final Effect effect = getFirstEffect(skill); // Like L2OFF toogle skills have little delay - if ((_toggleUse != 0) && ((_toggleUse + 400) > Chronos.currentTimeMillis())) + if ((_toggleUse != 0) && ((_toggleUse + 400) > System.currentTimeMillis())) { _toggleUse = 0; sendPacket(ActionFailed.STATIC_PACKET); return; } - _toggleUse = Chronos.currentTimeMillis(); + _toggleUse = System.currentTimeMillis(); if (effect != null) { // fake death exception @@ -10481,7 +10480,7 @@ public class Player extends Playable protected LookingForFishTask(int fishWaitTime, int fishGutsCheck, int fishType, boolean isNoob, boolean isUpperGrade) { _fishGutsCheck = fishGutsCheck; - _endTaskTime = Chronos.currentTimeMillis() + fishWaitTime + 10000; + _endTaskTime = System.currentTimeMillis() + fishWaitTime + 10000; _fishType = fishType; _isNoob = isNoob; _isUpperGrade = isUpperGrade; @@ -10490,7 +10489,7 @@ public class Player extends Playable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTaskTime) + if (System.currentTimeMillis() >= _endTaskTime) { endFishing(false); return; @@ -14389,7 +14388,7 @@ public class Player extends Playable public void restoreCustomStatus() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (getVariables().getLong("CustomDonatorEnd", 0) > currentTime) { setDonator(true); @@ -15010,7 +15009,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -15050,7 +15049,7 @@ public class Player extends Playable // Prevent falling under ground. sendPacket(new ValidateLocation(this)); - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; return false; } @@ -15450,7 +15449,7 @@ public class Player extends Playable public void addConfirmDlgRequestTime(int requestId, int time) { - _confirmDlgRequests.put(requestId, Chronos.currentTimeMillis() + time + 2000); + _confirmDlgRequests.put(requestId, System.currentTimeMillis() + time + 2000); } public Long getConfirmDlgRequestTime(int requestId) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java index 1e3128921d..71151b35f3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.xml.MapRegionData; @@ -201,7 +200,7 @@ public class Auctioneer extends Folk html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getDesc()); @@ -404,7 +403,7 @@ public class Auctioneer extends Folk html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getDesc()); @@ -435,7 +434,7 @@ public class Auctioneer extends Folk html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getClanHallById(a.getItemId()).getDesc()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 1f10bc3714..c2282318c8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -20,7 +20,6 @@ import java.util.Iterator; import java.util.Set; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.SkillTreeTable; import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; @@ -633,13 +632,13 @@ public class VillageMaster extends Folk return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); ClanTable.getInstance().scheduleRemoveClan(clan.getClanId()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java index a5e32f33d2..8f1f11ea02 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -32,7 +32,6 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.SkillTable; @@ -466,7 +465,7 @@ public class Clan if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -484,7 +483,7 @@ public class Clan } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderName().equalsIgnoreCase(name) ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderName().equalsIgnoreCase(name) ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } } @@ -809,14 +808,14 @@ public class Clan setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -1811,7 +1810,7 @@ public class Clan } } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); sm.addString(target.getName()); @@ -1827,7 +1826,7 @@ public class Clan return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_HE_SHE_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -1882,7 +1881,7 @@ public class Clan } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -1938,7 +1937,7 @@ public class Clan return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2046,13 +2045,13 @@ public class Clan return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_10_DAYS_AFTER_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_CREATE_AN_ALLIANCE_DURING_THE_TERM_OF_DISSOLUTION_POSTPONEMENT); return; @@ -2121,7 +2120,7 @@ public class Clan broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClans()) { if ((clan.getAllyId() == getAllyId()) && (clan.getClanId() != getClanId())) @@ -2151,7 +2150,7 @@ public class Clan return; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.YOU_CANNOT_RAISE_YOUR_CLAN_LEVEL_DURING_THE_TERM_OF_DISPERSION_POSTPONEMENT); return; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 4c4907d6d6..72da5e4417 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -1113,7 +1112,7 @@ public class Item extends WorldObject getWorldRegion().addVisibleObject(this); } - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); // this can synchronize on others instancies, so it's out of synchronized, to avoid deadlocks // Add the Item dropped in the world as a visible object diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 5acbe69ea8..663ea256e1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -38,7 +38,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -321,7 +320,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd.intValue()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 88bf012206..5d3cdbb7d0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -183,7 +182,7 @@ public class ClanHall return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(), _endDate - currentTime); @@ -227,7 +226,7 @@ public class ClanHall newfc = false; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(newfc); getOwnerClan().getWarehouse().destroyItemByItemId("CH_function_fee", 57, fee, null, null); ThreadPool.schedule(new FunctionTask(), _rate); @@ -487,7 +486,7 @@ public class ClanHall _ownerId = clan.getClanId(); _isFree = false; - _paidUntil = Chronos.currentTimeMillis(); + _paidUntil = System.currentTimeMillis(); initialyzeTask(true); // Annonce to Online member new ClanHall @@ -748,20 +747,20 @@ public class ClanHall */ private void initialyzeTask(boolean forced) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_paidUntil > currentTime) { ThreadPool.schedule(new FeeTask(), _paidUntil - currentTime); } else if (!_paid && !forced) { - if ((Chronos.currentTimeMillis() + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate)) + if ((System.currentTimeMillis() + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate)) { - ThreadPool.schedule(new FeeTask(), Chronos.currentTimeMillis() + (1000 * 60 * 60 * 24)); + ThreadPool.schedule(new FeeTask(), System.currentTimeMillis() + (1000 * 60 * 60 * 24)); } else { - ThreadPool.schedule(new FeeTask(), (_paidUntil + _chRate) - Chronos.currentTimeMillis()); + ThreadPool.schedule(new FeeTask(), (_paidUntil + _chRate) - System.currentTimeMillis()); } } else @@ -790,25 +789,25 @@ public class ClanHall { if (_paidUntil != 0) { - while (_paidUntil < Chronos.currentTimeMillis()) + while (_paidUntil < System.currentTimeMillis()) { _paidUntil += _chRate; } } else { - _paidUntil = Chronos.currentTimeMillis() + _chRate; + _paidUntil = System.currentTimeMillis() + _chRate; } ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_rental_fee", 57, getLease(), null, null); - ThreadPool.schedule(new FeeTask(), _paidUntil - Chronos.currentTimeMillis()); + ThreadPool.schedule(new FeeTask(), _paidUntil - System.currentTimeMillis()); _paid = true; updateDb(); } else { _paid = false; - if (Chronos.currentTimeMillis() > (_paidUntil + _chRate)) + if (System.currentTimeMillis() > (_paidUntil + _chRate)) { if (ClanHallTable.getInstance().loaded()) { @@ -828,13 +827,13 @@ public class ClanHall sm.addNumber(getLease()); clan.broadcastToOnlineMembers(sm); - if ((Chronos.currentTimeMillis() + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate)) + if ((System.currentTimeMillis() + (1000 * 60 * 60 * 24)) <= (_paidUntil + _chRate)) { - ThreadPool.schedule(new FeeTask(), Chronos.currentTimeMillis() + (1000 * 60 * 60 * 24)); + ThreadPool.schedule(new FeeTask(), System.currentTimeMillis() + (1000 * 60 * 60 * 24)); } else { - ThreadPool.schedule(new FeeTask(), (_paidUntil + _chRate) - Chronos.currentTimeMillis()); + ThreadPool.schedule(new FeeTask(), (_paidUntil + _chRate) - System.currentTimeMillis()); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index d3bb561916..451cf1fd4a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.AuctionManager; @@ -169,7 +168,7 @@ public class ClanHallAuction public ClanHallAuction(int itemId, Clan clan, long delay, int bid, String name) { _id = itemId; - _endDate = Chronos.currentTimeMillis() + delay; + _endDate = System.currentTimeMillis() + delay; _itemId = itemId; _itemName = name; _itemType = "ClanHall"; @@ -255,7 +254,7 @@ public class ClanHallAuction */ private void startAutoTask() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long taskDelay = 0; if (_endDate <= currentTime) { @@ -368,7 +367,7 @@ public class ClanHallAuction statement.setInt(1, bidder.getClanId()); statement.setString(2, bidder.getClan().getLeaderName()); statement.setInt(3, bid); - statement.setLong(4, Chronos.currentTimeMillis()); + statement.setLong(4, System.currentTimeMillis()); statement.setInt(5, _id); statement.setInt(6, bidder.getClanId()); statement.execute(); @@ -383,7 +382,7 @@ public class ClanHallAuction statement.setString(4, bidder.getName()); statement.setInt(5, bid); statement.setString(6, bidder.getClan().getName()); - statement.setLong(7, Chronos.currentTimeMillis()); + statement.setLong(7, System.currentTimeMillis()); statement.execute(); statement.close(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java index eefde3236c..88e98990f6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.handler.AutoChatHandler; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -483,7 +482,7 @@ public class SevenSigns */ public long getMilliToPeriodChange() { - final long currTimeMillis = Chronos.currentTimeMillis(); + final long currTimeMillis = System.currentTimeMillis(); final long changeTimeMillis = _calendar.getTimeInMillis(); return changeTimeMillis - currTimeMillis; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java index 50fc6fe560..34ad6ff271 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -3640,7 +3639,7 @@ public class SevenSignsFestival implements SpawnListener */ public void setNextCycleStart() { - _nextFestivalCycleStart = Chronos.currentTimeMillis() + Config.ALT_FESTIVAL_CYCLE_LENGTH; + _nextFestivalCycleStart = System.currentTimeMillis() + Config.ALT_FESTIVAL_CYCLE_LENGTH; } /** @@ -3649,7 +3648,7 @@ public class SevenSignsFestival implements SpawnListener */ public void setNextFestivalStart(long milliFromNow) { - _nextFestivalStart = Chronos.currentTimeMillis() + milliFromNow; + _nextFestivalStart = System.currentTimeMillis() + milliFromNow; } /** @@ -3662,7 +3661,7 @@ public class SevenSignsFestival implements SpawnListener { return -1; } - return Math.round((_nextFestivalCycleStart - Chronos.currentTimeMillis()) / 60000); + return Math.round((_nextFestivalCycleStart - System.currentTimeMillis()) / 60000); } /** @@ -3675,7 +3674,7 @@ public class SevenSignsFestival implements SpawnListener { return -1; } - return Math.round((_nextFestivalStart - Chronos.currentTimeMillis()) / 60000) + 1; + return Math.round((_nextFestivalStart - System.currentTimeMillis()) / 60000) + 1; } /** @@ -4004,7 +4003,7 @@ public class SevenSignsFestival implements SpawnListener } // Update the highest scores and party list. - currFestData.set("date", String.valueOf(Chronos.currentTimeMillis())); + currFestData.set("date", String.valueOf(System.currentTimeMillis())); currFestData.set("score", offeringScore); currFestData.set("members", Util.implodeString(partyMembers, ",")); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/ClanHallSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/ClanHallSiege.java index b2b1d77d3e..fc0e5fba80 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/ClanHallSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/ClanHallSiege.java @@ -23,7 +23,6 @@ import java.util.Calendar; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; /** * @author MHard @@ -61,9 +60,9 @@ public abstract class ClanHallSiege public void setNewSiegeDate(long siegeDate, int clanHallId, int hour) { final Calendar tmpDate = Calendar.getInstance(); - if (siegeDate <= Chronos.currentTimeMillis()) + if (siegeDate <= System.currentTimeMillis()) { - tmpDate.setTimeInMillis(Chronos.currentTimeMillis()); + tmpDate.setTimeInMillis(System.currentTimeMillis()); tmpDate.add(Calendar.DAY_OF_MONTH, 3); tmpDate.set(Calendar.DAY_OF_WEEK, 6); tmpDate.set(Calendar.HOUR_OF_DAY, hour); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java index 9251582484..f4163187e4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.enums.SiegeTeleportWhoType; @@ -305,12 +304,12 @@ public class Siege player.sendPacket(sound); } - LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has finished! " + fmt.format(new Date(Chronos.currentTimeMillis()))); + LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has finished! " + fmt.format(new Date(System.currentTimeMillis()))); if (getCastle().getOwnerId() <= 0) { announceToPlayer("The siege of " + getCastle().getName() + " has ended in a draw.", false); - LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has ended in a draw. " + fmt.format(new Date(Chronos.currentTimeMillis()))); + LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has ended in a draw. " + fmt.format(new Date(System.currentTimeMillis()))); } // Removes all flags. Note: Remove flag before teleporting players @@ -586,7 +585,7 @@ public class Siege player.sendPacket(sound); } - LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has started! " + fmt.format(new Date(Chronos.currentTimeMillis()))); + LOGGER.info("[SIEGE] The siege of " + getCastle().getName() + " has started! " + fmt.format(new Date(System.currentTimeMillis()))); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java index 7f43d0ae67..73930c3a77 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java @@ -25,7 +25,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -521,9 +520,9 @@ public class BanditStrongholdSiege extends ClanHallSiege } final Calendar siegeStart = Calendar.getInstance(); siegeStart.setTimeInMillis(getSiegeDate().getTimeInMillis()); - final long registerTimeRemaining = siegeStart.getTimeInMillis() - Chronos.currentTimeMillis(); + final long registerTimeRemaining = siegeStart.getTimeInMillis() - System.currentTimeMillis(); siegeStart.add(Calendar.MINUTE, 60); // HOUR - final long siegeTimeRemaining = siegeStart.getTimeInMillis() - Chronos.currentTimeMillis(); + final long siegeTimeRemaining = siegeStart.getTimeInMillis() - System.currentTimeMillis(); long remaining = registerTimeRemaining; if ((registerTimeRemaining <= 0) && !_registrationPeriod) { @@ -590,7 +589,7 @@ public class BanditStrongholdSiege extends ClanHallSiege cancel(); return; } - final long timeRemaining = _siegeEndDate.getTimeInMillis() - Chronos.currentTimeMillis(); + final long timeRemaining = _siegeEndDate.getTimeInMillis() - System.currentTimeMillis(); if (timeRemaining <= 0) { endSiege(true); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java index 290d4714d5..7ae4c02fd5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/DevastatedCastle.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -131,7 +130,7 @@ public class DevastatedCastle final RunMessengerSpawn rms = new RunMessengerSpawn(); ThreadPool.schedule(rms, milliToSiege); - final long total_millis = Chronos.currentTimeMillis() + milliToSiege; + final long total_millis = System.currentTimeMillis() + milliToSiege; final GregorianCalendar cal = (GregorianCalendar) Calendar.getInstance(); cal.setTimeInMillis(total_millis); final String next_ch_siege_date = new SimpleDateFormat("yyyy/MM/dd HH:mm").format(cal.getTimeInMillis()); @@ -175,7 +174,7 @@ public class DevastatedCastle private long getMilliToSiege() { - final long currTimeMillis = Chronos.currentTimeMillis(); + final long currTimeMillis = System.currentTimeMillis(); final long siegeTimeMillis = _siegetime.getTimeInMillis(); return siegeTimeMillis - currTimeMillis; } @@ -844,7 +843,7 @@ public class DevastatedCastle { PreparedStatement statement; statement = con.prepareStatement("UPDATE clanhall SET paidUntil=?, paid=? WHERE id=?"); - statement.setLong(1, Chronos.currentTimeMillis() + 59760000); + statement.setLong(1, System.currentTimeMillis() + 59760000); statement.setInt(2, 1); statement.setInt(3, 34); statement.execute(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java index d1ebb10d7d..46681654c9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/FortressOfResistance.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -116,7 +115,7 @@ public class FortressOfResistance final RunMessengerSpawn rms = new RunMessengerSpawn(); ThreadPool.schedule(rms, milliToCapture); - final long total_millis = Chronos.currentTimeMillis() + milliToCapture; + final long total_millis = System.currentTimeMillis() + milliToCapture; final GregorianCalendar cal = (GregorianCalendar) Calendar.getInstance(); cal.setTimeInMillis(total_millis); final String next_ch_siege_date = new SimpleDateFormat("yyyy/MM/dd HH:mm").format(cal.getTimeInMillis()); @@ -160,7 +159,7 @@ public class FortressOfResistance private long getMilliToCapture() { - final long currTimeMillis = Chronos.currentTimeMillis(); + final long currTimeMillis = System.currentTimeMillis(); final long captureTimeMillis = _capturetime.getTimeInMillis(); return captureTimeMillis - currTimeMillis; } @@ -338,7 +337,7 @@ public class FortressOfResistance { PreparedStatement statement; statement = con.prepareStatement("UPDATE clanhall SET paidUntil=?, paid=? WHERE id=?"); - statement.setLong(1, Chronos.currentTimeMillis() + 59760000); + statement.setLong(1, System.currentTimeMillis() + 59760000); statement.setInt(2, 1); statement.setInt(3, 21); statement.execute(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java index 37f3b213ad..7441cc3540 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java @@ -25,7 +25,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -510,9 +509,9 @@ public class WildBeastFarmSiege extends ClanHallSiege } final Calendar siegeStart = Calendar.getInstance(); siegeStart.setTimeInMillis(getSiegeDate().getTimeInMillis()); - final long registerTimeRemaining = siegeStart.getTimeInMillis() - Chronos.currentTimeMillis(); + final long registerTimeRemaining = siegeStart.getTimeInMillis() - System.currentTimeMillis(); siegeStart.add(Calendar.HOUR, 1); - final long siegeTimeRemaining = siegeStart.getTimeInMillis() - Chronos.currentTimeMillis(); + final long siegeTimeRemaining = siegeStart.getTimeInMillis() - System.currentTimeMillis(); long remaining = registerTimeRemaining; if ((registerTimeRemaining <= 0) && !_registrationPeriod) { @@ -579,7 +578,7 @@ public class WildBeastFarmSiege extends ClanHallSiege cancel(); return; } - final long timeRemaining = _siegeEndDate.getTimeInMillis() - Chronos.currentTimeMillis(); + final long timeRemaining = _siegeEndDate.getTimeInMillis() - System.currentTimeMillis(); if (timeRemaining <= 0) { endSiege(true); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java index 7ef9b54eaf..150dde801b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.TerritoryTable; import org.l2jmobius.gameserver.data.xml.WalkerRouteData; @@ -320,7 +319,7 @@ public class Spawn _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + _respawnDelay); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + _respawnDelay); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java index b593a64116..b196b040bf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -138,7 +137,7 @@ public class BossZone extends ZoneType if (expirationTime == null) // legal null expirationTime entries { final long serverStartTime = GameServer.dateTimeServerStarted.getTimeInMillis(); - if (serverStartTime > (Chronos.currentTimeMillis() - _timeInvade)) + if (serverStartTime > (System.currentTimeMillis() - _timeInvade)) { return; } @@ -148,7 +147,7 @@ public class BossZone extends ZoneType // legal non-null logoutTime entries _playerAllowedReEntryTimes.remove(creature.getObjectId()); - if (expirationTime.longValue() > Chronos.currentTimeMillis()) + if (expirationTime.longValue() > System.currentTimeMillis()) { return; } @@ -205,7 +204,7 @@ public class BossZone extends ZoneType if (!player.isOnline() && _playersAllowed.contains(creature.getObjectId())) { // mark the time that the player left the zone - _playerAllowedReEntryTimes.put(creature.getObjectId(), Chronos.currentTimeMillis() + _timeInvade); + _playerAllowedReEntryTimes.put(creature.getObjectId(), System.currentTimeMillis() + _timeInvade); } } } @@ -304,7 +303,7 @@ public class BossZone extends ZoneType { _playersAllowed.add(player.getObjectId()); } - _playerAllowedReEntryTimes.put(player.getObjectId(), Chronos.currentTimeMillis() + (durationInSec * 1000)); + _playerAllowedReEntryTimes.put(player.getObjectId(), System.currentTimeMillis() + (durationInSec * 1000)); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index 2458da9edc..2ab2fc8b37 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -36,7 +36,6 @@ import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.SkillTable; @@ -308,7 +307,7 @@ public class GameClient extends ChannelInboundHandler else { statement = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?"); - statement.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + statement.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 statement.setInt(2, objectId); statement.execute(); statement.close(); @@ -675,7 +674,7 @@ public class GameClient extends ChannelInboundHandler if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } OfflineTraderTable.getInstance().storeOffliner(player); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 1a35d3a086..722973331a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -88,7 +87,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 27be462760..fb72788930 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -66,7 +65,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java index e60824e27a..ac8bacd6a8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +50,7 @@ public class DlgAnswer implements IClientIncomingPacket } final Long answerTime = player.getConfirmDlgRequestTime(_requesterId); - if ((_answer == 1) && (answerTime != null) && (Chronos.currentTimeMillis() > answerTime)) + if ((_answer == 1) && (answerTime != null) && (System.currentTimeMillis() > answerTime)) { _answer = 0; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index e2df308556..8277a11219 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -26,7 +26,6 @@ import java.util.regex.PatternSyntaxException; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.MailBBSManager; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -372,7 +371,7 @@ public class EnterWorld implements IClientIncomingPacket DimensionalRiftManager.getInstance().teleportToWaitingRoom(player); } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } @@ -646,7 +645,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.SERVER_TIME_ON_START) { - player.sendMessage("SVR time is " + fmt.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("SVR time is " + fmt.format(new Date(System.currentTimeMillis()))); } // EnterWorld has finished. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index 45f2d15969..e942457677 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Creature; @@ -132,7 +131,7 @@ public class Logout implements IClientIncomingPacket if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } return; } @@ -144,7 +143,7 @@ public class Logout implements IClientIncomingPacket if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index c716bb0760..315cd313c8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -69,7 +68,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.DURING_THE_GRACE_PERIOD_FOR_DISSOLVING_A_CLAN_THE_REGISTRATION_OR_DELETION_OF_A_CLAN_S_CREST_IS_NOT_ALLOWED); return; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index 9edc795b5f..b0232a13ba 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -68,7 +67,7 @@ public class RequestJoinSiege implements IClientIncomingPacket if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < player.getClan().getDissolvingExpiryTime()) + if (System.currentTimeMillis() < player.getClan().getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; @@ -100,7 +99,7 @@ public class RequestJoinSiege implements IClientIncomingPacket if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < player.getClan().getDissolvingExpiryTime()) + if (System.currentTimeMillis() < player.getClan().getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 4cc2a180a3..9e0bec2b90 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -81,8 +80,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(_target, Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // Like L2OFF also player takes the penality - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(_target, System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // Like L2OFF also player takes the penality + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 34bc35bacd..ecb2835993 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -74,7 +73,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.DURING_THE_GRACE_PERIOD_FOR_DISSOLVING_A_CLAN_THE_REGISTRATION_OR_DELETION_OF_A_CLAN_S_CREST_IS_NOT_ALLOWED); return; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 180f82210d..400926dc61 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -62,7 +61,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getName(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getName(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java index 66aa17971b..21f52d6c73 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java @@ -24,7 +24,6 @@ import java.util.List; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -161,7 +160,7 @@ public class CharSelectInfo implements IClientOutgoingPacket int deletedays = 0; if (deleteTime > 0) { - deletedays = (int) ((deleteTime - Chronos.currentTimeMillis()) / 1000); + deletedays = (int) ((deleteTime - System.currentTimeMillis()) / 1000); } else if (accesslevels < 0) { @@ -239,7 +238,7 @@ public class CharSelectInfo implements IClientOutgoingPacket final int objectId = chardata.getInt("charId"); // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Player cha = Player.load(objectId); final Clan clan = cha.getClan(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index f5bee32414..8b050a8f12 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Timestamp; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -35,7 +34,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); _reuseTimestamps = player.getReuseTimeStamps(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index baa62f37f6..0369261264 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index 38af9c2d97..1e0b52aa87 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Cubic; @@ -57,7 +56,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -112,7 +111,7 @@ public class AttackStanceTaskManager implements Runnable } } } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index f08db08286..2cae4c1467 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.TradeManager; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingTimes = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : REFRESH_TIME.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -113,7 +112,7 @@ public class BuyListTaskManager PENDING_UPDATES.add(time); } } - REFRESH_TIME.put(time, Chronos.currentTimeMillis() + (timeValue * 60 * 60 * 1000L)); + REFRESH_TIME.put(time, System.currentTimeMillis() + (timeValue * 60 * 60 * 1000L)); } else { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 4a4329d4a4..1aa150d95c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; @@ -44,7 +43,7 @@ public class DecayTaskManager implements Runnable @Override public void run() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); int delay; try { @@ -78,12 +77,12 @@ public class DecayTaskManager implements Runnable public void addDecayTask(Creature actor) { - _decayTasks.put(actor, Chronos.currentTimeMillis()); + _decayTasks.put(actor, System.currentTimeMillis()); } public void addDecayTask(Creature actor, int interval) { - _decayTasks.put(actor, Chronos.currentTimeMillis() + interval); + _decayTasks.put(actor, System.currentTimeMillis() + interval); } public void cancelDecayTask(Creature actor) @@ -104,7 +103,7 @@ public class DecayTaskManager implements Runnable ret += "Tasks count: " + _decayTasks.size() + "\r\n"; ret += "Tasks dump:\r\n"; - final Long current = Chronos.currentTimeMillis(); + final Long current = System.currentTimeMillis(); for (Creature actor : _decayTasks.keySet()) { ret += "Class/Name: " + actor.getClass().getSimpleName() + "/" + actor.getName() + " decay timer: " + (current - _decayTasks.get(actor)) + "\r\n"; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 5c5f3c8602..f55f679827 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -26,7 +26,6 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager; import org.l2jmobius.gameserver.model.actor.Creature; @@ -53,7 +52,7 @@ public class GameTimeTaskManager protected GameTimeTaskManager() { - _gameStartTime = Chronos.currentTimeMillis() - 3600000; // offset so that the server starts a day begin + _gameStartTime = System.currentTimeMillis() - 3600000; // offset so that the server starts a day begin _gameTicks = 3600000 / MILLIS_IN_TICK; // offset so that the server starts a day begin _timer = new TimerThread(); @@ -162,7 +161,7 @@ public class GameTimeTaskManager for (;;) { final int _oldTicks = _gameTicks; // save old ticks value to avoid moving objects 2x in same tick - long runtime = Chronos.currentTimeMillis() - _gameStartTime; // from server boot to now + long runtime = System.currentTimeMillis() - _gameStartTime; // from server boot to now _gameTicks = (int) (runtime / MILLIS_IN_TICK); // new ticks value (ticks now) @@ -174,7 +173,7 @@ public class GameTimeTaskManager // (will happen very rarely but it will happen ... on garbage collection definitely) } - runtime = Chronos.currentTimeMillis() - _gameStartTime - runtime; + runtime = System.currentTimeMillis() - _gameStartTime - runtime; // calculate sleep time... time needed to next tick minus time it takes to call moveObjects() final int sleepTime = (1 + MILLIS_IN_TICK) - ((int) runtime % MILLIS_IN_TICK); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 0add51a9dc..e0cabf5ce6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -22,7 +22,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.World; @@ -48,7 +47,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item == null) || (item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -85,7 +84,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 76583bc59e..a42495a496 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 2fc437cf6d..b35ccf6120 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.isRandomAnimationEnabled()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 6da0fb5ece..7d1c263024 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.spawn.Spawn; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 10f6a14c08..e8146a4e71 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -40,7 +40,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskOlympiadSave; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRaidPointsReset; @@ -94,7 +93,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection()) { @@ -258,7 +257,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -305,7 +304,7 @@ public class TaskManager return false; } - long delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + long delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { delay += interval; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 577f4885c9..8714cd200c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -148,7 +147,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java index 0a2d3b8ef7..368c8fe8a5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/MinionList.java @@ -24,7 +24,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.sql.NpcTable; @@ -98,7 +97,7 @@ public class MinionList public void moveMinionToRespawnList(Minion minion) { - final Long current = Chronos.currentTimeMillis(); + final Long current = System.currentTimeMillis(); _spawnedMinions.remove(minion); if (_respawnTasks.get(current) == null) { @@ -145,7 +144,7 @@ public class MinionList return; } - final Long current = Chronos.currentTimeMillis(); + final Long current = System.currentTimeMillis(); if (_respawnTasks != null) { for (Entry entry : _respawnTasks.entrySet()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java index 7134d0c97a..8e7b16bcd8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginController.java @@ -39,7 +39,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -174,7 +173,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -206,7 +205,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -271,7 +270,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -292,7 +291,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -444,7 +443,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -516,7 +515,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java index 90ca7077ee..2ff46a5410 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.loginserver.GameServerTable; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; import org.l2jmobius.loginserver.network.LoginClient; @@ -167,7 +166,7 @@ public class ServerList implements IOutgoingPacket packet.writeC(_charsToDelete.get(servId).length); for (long deleteTime : _charsToDelete.get(servId)) { - packet.writeD((int) ((deleteTime - Chronos.currentTimeMillis()) / 1000)); + packet.writeD((int) ((deleteTime - System.currentTimeMillis()) / 1000)); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java index 6197fa0edd..d51dfb3a78 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java @@ -47,7 +47,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.Shutdown; import org.l2jmobius.gameserver.cache.HtmCache; @@ -957,7 +956,7 @@ public class GameStatusThread extends Thread private String getUptime(int time) { - int uptime = (int) Chronos.currentTimeMillis() - time; + int uptime = (int) System.currentTimeMillis() - time; uptime = uptime / 1000; final int h = uptime / 3600; final int m = (uptime - (h * 3600)) / 60; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/TelnetStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/TelnetStatusThread.java index 7c21bca02a..674180ba36 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/TelnetStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/TelnetStatusThread.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; public class TelnetStatusThread extends Thread @@ -125,7 +124,7 @@ public class TelnetStatusThread extends Thread } statusServerSocket = new ServerSocket(_statusPort); - _uptime = (int) Chronos.currentTimeMillis(); + _uptime = (int) System.currentTimeMillis(); _loginStatus = new ArrayList<>(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index ad687b4064..ab6ed54fec 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 46c787b7e9..aced8b0b46 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -304,7 +303,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java index e7524bffd5..5903eee978 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java @@ -19,7 +19,6 @@ package ai.areas.Gracia.AI; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -128,7 +127,7 @@ public class Lindvior extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -146,6 +145,6 @@ public class Lindvior extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index a571c389fc..470c61ddc4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -285,7 +284,7 @@ public class HallOfErosionAttack extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(2100); sm.addPcName(partyMember); @@ -323,7 +322,7 @@ public class HallOfErosionAttack extends AbstractNpcAI { world = new HEAWorld(); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); - ((HEAWorld) world).startTime = Chronos.currentTimeMillis(); + ((HEAWorld) world).startTime = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); LOGGER.info("Hall Of Erosion Attack started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isInParty()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java index 2c530995bb..16ccb77a3e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -287,7 +286,7 @@ public class HallOfErosionDefence extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(2100); sm.addPcName(partyMember); @@ -325,7 +324,7 @@ public class HallOfErosionDefence extends AbstractNpcAI { world = new HEDWorld(); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); - ((HEDWorld) world).startTime = Chronos.currentTimeMillis(); + ((HEDWorld) world).startTime = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); LOGGER.info("Hall Of Erosion Defence started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isInParty()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java index 4584b3e72e..b3d14206ab 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -181,7 +180,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); @@ -227,7 +226,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI { world = new HSAWorld(); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); - ((HSAWorld) world).storeTime[0] = Chronos.currentTimeMillis(); + ((HSAWorld) world).storeTime[0] = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); LOGGER.info("Hall Of Suffering Attack started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); runTumors((HSAWorld) world); @@ -517,7 +516,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI && (world.klanikus.isDead() && world.klodekus.isDead())) { world.incStatus(); - world.storeTime[1] = Chronos.currentTimeMillis(); + world.storeTime[1] = System.currentTimeMillis(); final Long finishDiff = world.storeTime[1] - world.storeTime[0]; if (finishDiff < 1260000) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java index cace87e64d..5885e44829 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -181,7 +180,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); @@ -227,7 +226,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI { world = new HSDWorld(); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); - ((HSDWorld) world).storeTime[0] = Chronos.currentTimeMillis(); + ((HSDWorld) world).storeTime[0] = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); LOGGER.info("Hall Of Suffering Defence started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); runTumors((HSDWorld) world); @@ -517,7 +516,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI && (world.klanikus.isDead() && world.klodekus.isDead())) { world.incStatus(); - world.storeTime[1] = Chronos.currentTimeMillis(); + world.storeTime[1] = System.currentTimeMillis(); final Long finishDiff = world.storeTime[1] - world.storeTime[0]; if (finishDiff < 1260000) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index 5f3238dac3..382a1a2275 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -285,7 +284,7 @@ public class HeartInfinityAttack extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(2100); sm.addPcName(partyMember); @@ -404,7 +403,7 @@ public class HeartInfinityAttack extends AbstractNpcAI world.ekimus.broadcastPacket(new NpcSay(world.ekimus.getObjectId(), ChatType.SHOUT, world.ekimus.getId(), NpcStringId.I_SHALL_ACCEPT_YOUR_CHALLENGE_S1_COME_AND_DIE_IN_THE_ARMS_OF_IMMORTALITY)); world.hounds.add(addSpawn(HOUND, -179224, 209624, -15504, 16384, false, 0, false, world.getInstanceId())); world.hounds.add(addSpawn(HOUND, -179880, 209464, -15504, 16384, false, 0, false, world.getInstanceId())); - world.startTime = Chronos.currentTimeMillis(); + world.startTime = System.currentTimeMillis(); world.timerTask = ThreadPool.scheduleAtFixedRate(new TimerTask(world), 298 * 1000, 5 * 60 * 1000); } @@ -667,7 +666,7 @@ public class HeartInfinityAttack extends AbstractNpcAI @Override public void run() { - final long time = ((_world.startTime + (25 * 60 * 1000)) - Chronos.currentTimeMillis()) / 60000; + final long time = ((_world.startTime + (25 * 60 * 1000)) - System.currentTimeMillis()) / 60000; if (time == 0) { broadCastPacket(_world, new ExShowScreenMessage(NpcStringId.YOU_HAVE_FAILED_AT_S1_S2_THE_INSTANCE_WILL_SHORTLY_EXPIRE, 2, 8000)); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java index cfb1465679..3a0a069c5d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -305,7 +304,7 @@ public class HeartInfinityDefence extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(2100); sm.addPcName(partyMember); @@ -361,7 +360,7 @@ public class HeartInfinityDefence extends AbstractNpcAI } } } - ((HIDWorld) world).startTime = Chronos.currentTimeMillis(); + ((HIDWorld) world).startTime = System.currentTimeMillis(); ((HIDWorld) world).finishTask = ThreadPool.schedule(new FinishTask((HIDWorld) world), 30 * 60000); ((HIDWorld) world).timerTask = ThreadPool.scheduleAtFixedRate(new TimerTask((HIDWorld) world), 298 * 1000, 5 * 60 * 1000); conquestBegins((HIDWorld) world); @@ -631,7 +630,7 @@ public class HeartInfinityDefence extends AbstractNpcAI @Override public void run() { - final long time = ((_world.startTime + (25 * 60 * 1000)) - Chronos.currentTimeMillis()) / 60000; + final long time = ((_world.startTime + (25 * 60 * 1000)) - System.currentTimeMillis()) / 60000; if (time == 0) { conquestConclusion(_world); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java index 36cd836c99..3af75bfe87 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -853,7 +852,7 @@ public class SeedOfDestruction extends AbstractNpcAI return false; } final Long reentertime = InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), INSTANCE_ID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = (new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET)); sm.addPcName(channelMember); @@ -901,7 +900,7 @@ public class SeedOfDestruction extends AbstractNpcAI return 0; } - world = new SODWorld(Chronos.currentTimeMillis() + 5400000); + world = new SODWorld(System.currentTimeMillis() + 5400000); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCE_ID)); InstanceManager.getInstance().addWorld(world); spawnState((SODWorld) world); @@ -921,7 +920,7 @@ public class SeedOfDestruction extends AbstractNpcAI if (player.getParty() == null) { player.sendMessage("Welcome to Seed of Destruction. Time to finish the instance is 130 minutes."); - InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCE_ID, (Chronos.currentTimeMillis())); + InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCE_ID, (System.currentTimeMillis())); teleportplayer(player, teleto, (SODWorld) world); if (InstanceManager.getInstance().getInstance(instanceId).isRemoveBuffEnabled()) { @@ -934,7 +933,7 @@ public class SeedOfDestruction extends AbstractNpcAI for (Player channelMember : player.getParty().getCommandChannel().getMembers()) { player.sendMessage("Welcome to Seed of Destruction. Time to finish the instance is 130 minutes."); - InstanceManager.getInstance().setInstanceTime(channelMember.getObjectId(), INSTANCE_ID, (Chronos.currentTimeMillis())); + InstanceManager.getInstance().setInstanceTime(channelMember.getObjectId(), INSTANCE_ID, (System.currentTimeMillis())); teleportplayer(channelMember, teleto, (SODWorld) world); if (InstanceManager.getInstance().getInstance(instanceId).isRemoveBuffEnabled()) { @@ -948,7 +947,7 @@ public class SeedOfDestruction extends AbstractNpcAI for (Player partyMember : player.getParty().getMembers()) { player.sendMessage("Welcome to Seed of Destruction. Time to finish the instance is 130 minutes."); - InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCE_ID, (Chronos.currentTimeMillis())); + InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCE_ID, (System.currentTimeMillis())); teleportplayer(partyMember, teleto, (SODWorld) world); if (InstanceManager.getInstance().getInstance(instanceId).isRemoveBuffEnabled()) { @@ -1121,7 +1120,7 @@ public class SeedOfDestruction extends AbstractNpcAI reenter.set(Calendar.MINUTE, RESET_MIN); reenter.set(Calendar.HOUR_OF_DAY, RESET_HOUR); // if time is >= RESET_HOUR - roll to the next day - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 1); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java index 010b58a2aa..9d1fed3975 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java @@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -799,7 +798,7 @@ public class TowerOfNaia extends AbstractNpcAI private void markElpyRespawn() { - final long respawnTime = (getRandom(43200, 216000) * 1000) + Chronos.currentTimeMillis(); + final long respawnTime = (getRandom(43200, 216000) * 1000) + System.currentTimeMillis(); GlobalVariablesManager.getInstance().set("elpy_respawn_time", respawnTime); } @@ -823,13 +822,13 @@ public class TowerOfNaia extends AbstractNpcAI private void spawnElpy() { final long respawnTime = GlobalVariablesManager.getInstance().getLong("elpy_respawn_time", 0); - if (respawnTime <= Chronos.currentTimeMillis()) + if (respawnTime <= System.currentTimeMillis()) { addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false); } else { - ThreadPool.schedule(() -> addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false), respawnTime - Chronos.currentTimeMillis()); + ThreadPool.schedule(() -> addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false), respawnTime - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java index 511f02bae3..52f0ad6558 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java @@ -16,7 +16,6 @@ */ package ai.areas.Hellbound.Instances.DemonPrinceFloor; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -144,7 +143,7 @@ public class DemonPrinceFloor extends AbstractInstance } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { party.broadcastPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addPcName(partyMember)); return false; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java index 64a0d77a4c..79c58c839b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java @@ -16,7 +16,6 @@ */ package ai.areas.Hellbound.Instances.RankuFloor; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -142,7 +141,7 @@ public class RankuFloor extends AbstractInstance } final Long reenterTime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID); - if (Chronos.currentTimeMillis() < reenterTime) + if (System.currentTimeMillis() < reenterTime) { party.broadcastPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addPcName(partyMember)); return false; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index a0f0813716..fc9ca1bc2d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -111,7 +110,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); if ((currentTime > (startSiegeDate - (HOURS_BEFORE * 360000))) && (currentTime < startSiegeDate)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index cb5c8cc8d2..9535d6ae11 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -169,14 +168,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -768,7 +767,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e17555aa12..24a3453a9c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; @@ -136,7 +135,7 @@ public class Baium extends AbstractNpcAI { _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -149,7 +148,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -209,7 +208,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, null); startQuestTimer("SOCIAL_ACTION", 10000, _baium, player); @@ -374,7 +373,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { cancelQuestTimers("SELECT_TARGET"); notifyEvent("CLEAR_ZONE", null, null); @@ -383,7 +382,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -484,7 +483,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -660,7 +659,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", System.currentTimeMillis() + respawnTime); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index a776542a9e..caebf5f9b5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -110,7 +109,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -351,7 +350,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -509,7 +508,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java index c7aa81c046..eb7e6b2a9a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java index 3758761cfb..f58312bd19 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java @@ -16,7 +16,6 @@ */ package ai.bosses.DrChaos; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -68,7 +67,7 @@ public class DrChaos extends AbstractNpcAI // Load the reset date and time for Dr. Chaos from DB. if (status == DEAD) { - final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); if (temp > 0) { startQuestTimer("reset_drchaos", temp, null, null, false); @@ -97,7 +96,7 @@ public class DrChaos extends AbstractNpcAI golem.setRunning(); // start monitoring Dr. Chaos's inactivity - _lastAttackVsGolem = Chronos.currentTimeMillis(); + _lastAttackVsGolem = System.currentTimeMillis(); startQuestTimer("golem_despawn", 60000, golem, null, true); } // Spawn the regular NPC. @@ -118,7 +117,7 @@ public class DrChaos extends AbstractNpcAI // despawn the live Dr. Chaos after 30 minutes of inactivity else if (event.equalsIgnoreCase("golem_despawn") && (npc != null)) { - if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < Chronos.currentTimeMillis())) + if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis())) { final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more @@ -156,7 +155,7 @@ public class DrChaos extends AbstractNpcAI golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0)); // start monitoring Dr. Chaos's inactivity - _lastAttackVsGolem = Chronos.currentTimeMillis(); + _lastAttackVsGolem = System.currentTimeMillis(); startQuestTimer("golem_despawn", 60000, golem, null, true); // Delete Dr. Chaos after spawned the war golem. @@ -242,7 +241,7 @@ public class DrChaos extends AbstractNpcAI // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info); return null; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java index 4b11b6e7dc..c7ee2e52a8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -294,7 +293,7 @@ public class Frintezza extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA); if (status == DEAD) { - final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); if (temp > 0) { startQuestTimer("frintezza_unlock", temp, null, null); @@ -1235,7 +1234,7 @@ public class Frintezza extends AbstractNpcAI } else if (event.equalsIgnoreCase("frintezza_despawn")) { - temp = (Chronos.currentTimeMillis() - _lastAction); + temp = (System.currentTimeMillis() - _lastAction); if (temp > 900000) { _zone.oustAllPlayers(); @@ -1319,7 +1318,7 @@ public class Frintezza extends AbstractNpcAI startQuestTimer("room1_spawn", 5000, npc, null); startQuestTimer("room_final", 2100000, npc, null); startQuestTimer("frintezza_despawn", 60000, npc, null, true); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); _playersInside.add(player); _zone.allowPlayerEntry(player, 300); player.teleToLocation(_invadeLoc[_locCycle][0] + Rnd.get(50), _invadeLoc[_locCycle][1] + Rnd.get(50), _invadeLoc[_locCycle][2]); @@ -1347,7 +1346,7 @@ public class Frintezza extends AbstractNpcAI startQuestTimer("room1_spawn", 5000, npc, null); startQuestTimer("room_final", 2100000, npc, null); startQuestTimer("frintezza_despawn", 60000, npc, null, true); - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); for (Party party : cc.getParties()) { if (party == null) @@ -1398,7 +1397,7 @@ public class Frintezza extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon) { - _lastAction = Chronos.currentTimeMillis(); + _lastAction = System.currentTimeMillis(); if (npc.getId() == FRINTEZZA) { npc.setCurrentHpMp(npc.getMaxHp(), 0); @@ -1473,7 +1472,7 @@ public class Frintezza extends AbstractNpcAI startQuestTimer("frintezza_unlock", respawnTime, npc, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(FRINTEZZA, info); } else if (npc.getId() == 18328) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 4031b57cea..a7a3b7fdd9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -92,7 +91,7 @@ public class Orfen extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -326,7 +325,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 5f2971487f..58b872a5a1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; @@ -94,7 +93,7 @@ public class QueenAnt extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -355,7 +354,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index 3181fd8225..c26218a8f4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -86,7 +85,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -102,7 +101,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f9b7ee12ac..4843e1b1c9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 67c59fa89b..0a30150197 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -129,7 +128,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -168,7 +167,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -196,7 +195,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -220,7 +219,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -416,7 +415,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -447,7 +446,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index 6859df61db..9bb03a27d8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.SpawnTable; @@ -181,7 +180,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine // XXX _rainbow.siegeEnds(); ThreadPool.schedule(new SetFinalAttackers(), _rainbow.getNextSiegeTime()); - setRegistrationEndString((_rainbow.getNextSiegeTime() + Chronos.currentTimeMillis()) - 3600000); + setRegistrationEndString((_rainbow.getNextSiegeTime() + System.currentTimeMillis()) - 3600000); // Teleport out of the arenas is made 2 mins after game ends ThreadPool.schedule(new TeleportBack(), 120000); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index fa923d8a3f..351399869b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -18,7 +18,6 @@ package events.CharacterBirthday; import java.util.Calendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -92,7 +91,7 @@ public class CharacterBirthday extends AbstractNpcAI if (event.equalsIgnoreCase("receive_reward")) { final Calendar now = Calendar.getInstance(); - now.setTimeInMillis(Chronos.currentTimeMillis()); + now.setTimeInMillis(System.currentTimeMillis()); // Check if already received reward final String nextBirthday = st.get("Birthday"); if ((nextBirthday != null) && (Integer.parseInt(nextBirthday) > now.get(Calendar.YEAR))) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 7f73817dfc..734cda5237 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -94,9 +93,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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 +109,7 @@ public class GiftOfVitality extends LongTimeEvent { player.doCast(GIFT_OF_VITALITY.getSkill()); player.doSimultaneousCast(JOY_OF_VITALITY.getSkill()); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 54eb3f3065..4fa731a370 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 9231330020..52c8d0c693 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index e9d51afc9a..5d61d917fe 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java index 6f661bf9d1..a6b264974b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CHSiegeManager; @@ -164,7 +163,7 @@ public class AdminCHSiege implements IAdminCommandHandler c.set(Calendar.HOUR_OF_DAY, h); c.set(Calendar.MINUTE, min); c.set(Calendar.SECOND, 0); - if (c.getTimeInMillis() > Chronos.currentTimeMillis()) + if (c.getTimeInMillis() > System.currentTimeMillis()) { activeChar.sendMessage(hall.getName() + " siege: " + c.getTime()); hall.setNextSiegeDate(c.getTimeInMillis()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 498d89bc50..beb4561e6e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 0d35a4b0a9..addbb3ee85 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.Calendar; import java.util.StringTokenizer; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.SoDManager; import org.l2jmobius.gameserver.instancemanager.SoIManager; @@ -74,7 +73,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (SoDManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + SoDManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + SoDManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 46e005b854..865a35881b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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; @@ -125,7 +124,7 @@ public class AdminInstanceZone implements IAdminCommandHandler { int hours = 0; int minutes = 0; - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 9f76aafa46..5888942445 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java index 9a9e38bd74..1a5c131dc5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.Collection; import java.util.StringTokenizer; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; @@ -117,11 +116,11 @@ public class AdminTerritoryWar implements IAdminCommandHandler } else if (command.equalsIgnoreCase("admin_territory_war_start")) { - TerritoryWarManager.getInstance().setTWStartTimeInMillis(Chronos.currentTimeMillis()); + TerritoryWarManager.getInstance().setTWStartTimeInMillis(System.currentTimeMillis()); } else if (command.equalsIgnoreCase("admin_territory_war_end")) { - TerritoryWarManager.getInstance().setTWStartTimeInMillis(Chronos.currentTimeMillis() - TerritoryWarManager.WARLENGTH); + TerritoryWarManager.getInstance().setTWStartTimeInMillis(System.currentTimeMillis() - TerritoryWarManager.WARLENGTH); } else if (command.equalsIgnoreCase("admin_territory_wards_list")) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 206f3a5990..3fdc90ed38 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index ad53c3f681..70e687ad5c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -46,7 +45,7 @@ public class ClanPenalty implements IUserCommandHandler final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/AbstractInstance.java index 3181e80fa7..9eaa4cdc38 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/AbstractInstance.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.SkillFinishType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -131,7 +130,7 @@ public abstract class AbstractInstance extends AbstractNpcAI { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -141,7 +140,7 @@ public abstract class AbstractInstance extends AbstractNpcAI calendar.set(Calendar.MINUTE, data.getMinute()); calendar.set(Calendar.SECOND, 0); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index 52c592d30c..0ad58fb132 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -195,7 +194,7 @@ public class CastleDungeon extends AbstractInstance return "36403-02.html"; } - if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), CASTLE_DUNGEON.get(npc.getId()))) + if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), CASTLE_DUNGEON.get(npc.getId()))) { return "36403-03.html"; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java index 173a296a21..d988e85ee2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java @@ -19,7 +19,6 @@ package instances.CavernOfThePirateCaptain; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -148,7 +147,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance if (firstEntrance) { world.setParameter("isNight", world.getTemplateId() == TEMPLATE_ID_60_NIGHT); - world.setParameter("storeTime", Chronos.currentTimeMillis()); + world.setParameter("storeTime", System.currentTimeMillis()); final List playersInside = new ArrayList<>(); if (!player.isInParty()) @@ -232,7 +231,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance } final Long reentertime = InstanceManager.getInstance().getInstanceTime(groupMembers.getObjectId(), isNight ? TEMPLATE_ID_60_NIGHT : TEMPLATE_ID_60); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { broadcastSystemMessage(player, groupMembers, SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, true); return false; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index e0c080f6f0..826edd7784 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -22,7 +22,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -153,7 +152,7 @@ public abstract class Chamber extends AbstractInstance { final long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); @@ -211,7 +210,7 @@ public abstract class Chamber extends AbstractInstance } // Teleport to raid room 10 min or lesser before instance end time for Tower and Square Chambers - else if (isBigChamber() && ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) < 600000)) + else if (isBigChamber() && ((inst.getInstanceEndTime() - System.currentTimeMillis()) < 600000)) { newRoom = ROOM_ENTER_POINTS.length - 1; } @@ -244,7 +243,7 @@ public abstract class Chamber extends AbstractInstance // Do not schedule room change for Square and Tower Chambers, if raid room is reached if (isBigChamber() && isBossRoom(world)) { - inst.setDuration((int) ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) + 1200000)); // Add 20 min to instance time if raid room is reached + inst.setDuration((int) ((inst.getInstanceEndTime() - System.currentTimeMillis()) + 1200000)); // Add 20 min to instance time if raid room is reached for (Npc npc : inst.getNpcs()) { @@ -501,7 +500,7 @@ public abstract class Chamber extends AbstractInstance if (isBigChamber()) { markRestriction(world); // Set reenter restriction - if ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) > 300000) + if ((inst.getInstanceEndTime() - System.currentTimeMillis()) > 300000) { inst.setDuration(300000); // Finish instance in 5 minutes } @@ -552,7 +551,7 @@ public abstract class Chamber extends AbstractInstance final long nextInterval = bossRoom ? 60000 : (ROOM_CHANGE_INTERVAL + getRandom(ROOM_CHANGE_RANDOM_TIME)) * 1000; // Schedule next room change only if remaining time is enough - if ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) > nextInterval) + if ((inst.getInstanceEndTime() - System.currentTimeMillis()) > nextInterval) { world.setParameter("roomChangeTask", ThreadPool.schedule(new ChangeRoomTask(world), nextInterval - 5000)); } @@ -589,7 +588,7 @@ public abstract class Chamber extends AbstractInstance public void run() { final Instance inst = InstanceManager.getInstance().getInstance(_world.getInstanceId()); - if ((inst == null) || ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) < 60000)) + if ((inst == null) || ((inst.getInstanceEndTime() - System.currentTimeMillis()) < 60000)) { final ScheduledFuture banishTask = _world.getParameters().getObject("banishTask", ScheduledFuture.class); if (banishTask != null) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 820b1a5695..c70fb5ac85 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -551,7 +550,7 @@ public class CrystalCaverns extends AbstractInstance party.broadcastPacket(sm); return false; } - if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID)) + if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID)) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); @@ -973,9 +972,9 @@ public class CrystalCaverns extends AbstractInstance if (tmpworld instanceof CCWorld) { final CCWorld world = (CCWorld) tmpworld; - if (((world._dragonClawStart + DRAGONCLAWTIME) <= Chronos.currentTimeMillis()) || (world._dragonClawNeed <= 0)) + if (((world._dragonClawStart + DRAGONCLAWTIME) <= System.currentTimeMillis()) || (world._dragonClawNeed <= 0)) { - world._dragonClawStart = Chronos.currentTimeMillis(); + world._dragonClawStart = System.currentTimeMillis(); world._dragonClawNeed = caster.getParty().getMemberCount() - 1; } else @@ -1004,9 +1003,9 @@ public class CrystalCaverns extends AbstractInstance { return super.onSkillSee(npc, caster, skill, targets, isSummon); } - else if (((world.dragonScaleStart + DRAGONSCALETIME) <= Chronos.currentTimeMillis()) || (world.dragonScaleNeed <= 0)) + else if (((world.dragonScaleStart + DRAGONSCALETIME) <= System.currentTimeMillis()) || (world.dragonScaleNeed <= 0)) { - world.dragonScaleStart = Chronos.currentTimeMillis(); + world.dragonScaleStart = System.currentTimeMillis(); world.dragonScaleNeed = ((party == null) && caster.isGM()) ? 0 : party != null ? (party.getMemberCount() - 1) : 100; } else @@ -1767,7 +1766,7 @@ public class CrystalCaverns extends AbstractInstance if (checkConditions(player)) { - final InstanceWorld instance = new CCWorld(Chronos.currentTimeMillis() + 5400000); + final InstanceWorld instance = new CCWorld(System.currentTimeMillis() + 5400000); instance.setInstance(InstanceManager.getInstance().createDynamicInstance(TEMPLATE_ID)); InstanceManager.getInstance().addWorld(instance); onEnterInstance(player, instance, true); @@ -1944,7 +1943,7 @@ public class CrystalCaverns extends AbstractInstance return null; } world.setStatus(30); - final long time = world.endTime - Chronos.currentTimeMillis(); + final long time = world.endTime - System.currentTimeMillis(); final Instance baylorInstance = InstanceManager.getInstance().getInstance(world.getInstanceId()); baylorInstance.setDuration((int) time); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index ea484b4b57..cdf4089e31 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -25,7 +25,6 @@ import java.util.Map.Entry; import java.util.function.Function; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.SkillFinishType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -498,7 +497,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue()) + if (System.currentTimeMillis() < entry.getValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index 35e0162731..3a4adf92be 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -16,7 +16,6 @@ */ package quests.Q00307_ControlDeviceOfTheGiants; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -102,7 +101,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest { return "32711-09.html"; } - if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - Chronos.currentTimeMillis()) > 0) + if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - System.currentTimeMillis()) > 0) { return "32711-09a.html"; } @@ -169,7 +168,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest qst.setCond(2, true); } } - GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(Chronos.currentTimeMillis() + RESPAWN_DELAY)); + GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(System.currentTimeMillis() + RESPAWN_DELAY)); } break; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java index fd299e2766..8669a051f0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -103,13 +102,13 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest } GlobalVariablesManager.getInstance().set("VarangkaRespawn", respawnTime); - if ((respawnTime == 0) || ((respawnTime - Chronos.currentTimeMillis()) < 0)) + if ((respawnTime == 0) || ((respawnTime - System.currentTimeMillis()) < 0)) { startQuestTimer("altarSpawn", 5000, null, null); } else { - startQuestTimer("altarSpawn", respawnTime - Chronos.currentTimeMillis(), null, null); + startQuestTimer("altarSpawn", respawnTime - System.currentTimeMillis(), null, null); } } @@ -239,7 +238,7 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest _varangkaMinion1 = null; _varangkaMinion2 = null; final long respawn = Rnd.get(14400000, 28800000); - GlobalVariablesManager.getInstance().set("VarangkaRespawn", Chronos.currentTimeMillis() + respawn); + GlobalVariablesManager.getInstance().set("VarangkaRespawn", System.currentTimeMillis() + respawn); startQuestTimer("altarSpawn", respawn, null, null); takeItems(member, PROTECTION_SOULS_PENDANT, 1); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 8c363f0db2..80fd1e12b9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -241,7 +240,7 @@ public class Q00511_AwlUnderFoot extends Quest { return "FortressWarden-02b.htm"; } - else if (isEnter && (dungeon.getReEnterTime() > Chronos.currentTimeMillis())) + else if (isEnter && (dungeon.getReEnterTime() > System.currentTimeMillis())) { return "FortressWarden-07.htm"; } @@ -294,7 +293,7 @@ public class Q00511_AwlUnderFoot extends Quest final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); world.setInstance(instance); instance.setExitLoc(new Location(player)); - dungeon.setReEnterTime(Chronos.currentTimeMillis() + REENTERTIME); + dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME); InstanceManager.getInstance().addWorld(world); final int instanceId = world.getInstanceId(); LOGGER.info("Fortress AwlUnderFoot started " + dungeon.getInstanceId() + " Instance: " + instanceId + " created by player: " + player.getName()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java index 114ffd3a10..cc7b7626d7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java @@ -17,7 +17,6 @@ package quests.Q00610_MagicalPowerOfWaterPart2; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -55,7 +54,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest registerQuestItems(GREEN_TOTEM, ASHUTAR_HEART); final long test = GlobalVariablesManager.getInstance().getLong("Q00610_respawn", 0); - final long remain = test != 0 ? test - Chronos.currentTimeMillis() : 0; + final long remain = test != 0 ? test - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("spawn_npc", remain, null, null); @@ -159,7 +158,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest final int respawnMaxDelay = (int) (129600000 * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = getRandom(respawnMinDelay, respawnMaxDelay); cancelQuestTimer("despawn_ashutar", npc, null); - GlobalVariablesManager.getInstance().set("Q00610_respawn", String.valueOf(Chronos.currentTimeMillis() + respawnDelay)); + GlobalVariablesManager.getInstance().set("Q00610_respawn", String.valueOf(System.currentTimeMillis() + respawnDelay)); startQuestTimer("spawn_npc", respawnDelay, null, null); executeForEachPlayer(killer, npc, isSummon, true, false); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java index 2e589ab073..948f8e83cf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java @@ -17,7 +17,6 @@ package quests.Q00616_MagicalPowerOfFirePart2; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -55,7 +54,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest registerQuestItems(RED_TOTEM, NASTRON_HEART); final long test = GlobalVariablesManager.getInstance().getLong("Q00616_respawn", 0); - final long remain = test != 0 ? test - Chronos.currentTimeMillis() : 0; + final long remain = test != 0 ? test - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("spawn_npc", remain, null, null); @@ -159,7 +158,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest final int respawnMaxDelay = (int) (129600000 * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = getRandom(respawnMinDelay, respawnMaxDelay); cancelQuestTimer("despawn_nastron", npc, null); - GlobalVariablesManager.getInstance().set("Q00616_respawn", String.valueOf(Chronos.currentTimeMillis() + respawnDelay)); + GlobalVariablesManager.getInstance().set("Q00616_respawn", String.valueOf(System.currentTimeMillis() + respawnDelay)); startQuestTimer("spawn_npc", respawnDelay, null, null); executeForEachPlayer(killer, npc, isSummon, true, false); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index 330b3344ac..ff1b85a2bf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -269,7 +268,7 @@ public class Q00726_LightWithinTheDarkness extends Quest final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); world.setInstance(instance); instance.setExitLoc(new Location(player)); - dungeon.setReEnterTime(Chronos.currentTimeMillis() + 14400000); + dungeon.setReEnterTime(System.currentTimeMillis() + 14400000); InstanceManager.getInstance().addWorld(world); ThreadPool.schedule(new spawnNpcs((PAWORLD) world), 10000); for (Player partyMember : party.getMembers()) @@ -343,7 +342,7 @@ public class Q00726_LightWithinTheDarkness extends Quest { return "FortWarden-08.htm"; } - else if (isEnter && (dungeon.getReEnterTime() > Chronos.currentTimeMillis())) + else if (isEnter && (dungeon.getReEnterTime() > System.currentTimeMillis())) { return "FortWarden-09.htm"; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 15faa1824b..a018d01512 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -583,7 +582,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest } } - if (dungeon.getReEnterTime() > Chronos.currentTimeMillis()) + if (dungeon.getReEnterTime() > System.currentTimeMillis()) { return "CastleWarden-18.html"; } @@ -618,7 +617,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest world.setInstance(instance); instance.setExitLoc(new Location(player)); final int instanceId = world.getInstanceId(); - dungeon.setReEnterTime(Chronos.currentTimeMillis() + REENTER_INTERVAL); + dungeon.setReEnterTime(System.currentTimeMillis() + REENTER_INTERVAL); InstanceManager.getInstance().addWorld(world); ThreadPool.schedule(new spawnNpcs((CAUWorld) world), INITIAL_SPAWN_DELAY); if (DEBUG) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java index 6e8ccc2494..70e68d8406 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -178,7 +177,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -464,7 +463,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java index 48d1429fef..1f7f9b97fe 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -562,19 +561,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java index 14e6b64774..9b170ca441 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -126,7 +125,7 @@ public class BotReportTable c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -293,7 +292,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.FIVE_YEARS_HAVE_PASSED_SINCE_THIS_CHARACTER_S_CREATION); @@ -304,7 +303,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { @@ -424,12 +423,12 @@ public class BotReportTable c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -471,7 +470,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ee4ed00bab..c1ffa55802 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.instancemanager.CHSiegeManager; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; @@ -173,7 +172,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -362,7 +361,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c729b91a54..edf26864d5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 3cb4320ebf..cb3f8ffd78 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -274,7 +273,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, _nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(this::changeMode, _nextModeChange.getTimeInMillis() - System.currentTimeMillis()); } public void changeMode() diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index af003d2713..8d59bf2e85 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -36,7 +36,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -338,7 +337,7 @@ public class CursedWeaponsManager final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java index 617f812092..4627c2bfc7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; @@ -73,14 +72,14 @@ public class FishingChampionshipManager refreshWinResult(); recalculateMinLength(); - if (_enddate <= Chronos.currentTimeMillis()) + if (_enddate <= System.currentTimeMillis()) { - _enddate = Chronos.currentTimeMillis(); + _enddate = System.currentTimeMillis(); new finishChamp().run(); } else { - ThreadPool.schedule(new finishChamp(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new finishChamp(), _enddate - System.currentTimeMillis()); } } @@ -207,7 +206,7 @@ public class FishingChampionshipManager public long getTimeRemaining() { - return (_enddate - Chronos.currentTimeMillis()) / 60000; + return (_enddate - System.currentTimeMillis()) / 60000; } public String getWinnerName(int par) @@ -472,7 +471,7 @@ public class FishingChampionshipManager shutdown(); LOGGER.info("FishingChampionshipManager : new event period start."); - ThreadPool.schedule(new finishChamp(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new finishChamp(), _enddate - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 8fd8374d96..d9867a2b18 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -101,7 +100,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -177,7 +176,7 @@ public class IdManager statement.executeUpdate("UPDATE clanhall SET ownerId=0, paidUntil=0, paid=0 WHERE clanhall.ownerId NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -193,7 +192,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7aa9bed36b..c5cf01971f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; @@ -176,7 +175,7 @@ public class InstanceManager implements IXmlReader { final int id = rs.getInt("instanceId"); final long time = rs.getLong("time"); - if (time < Chronos.currentTimeMillis()) + if (time < System.currentTimeMillis()) { deleteInstanceTime(playerObjId, id); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 354fac1235..c5c24adbd7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index efcac8ca63..9ea9a9e821 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -70,7 +69,7 @@ public class PunishmentManager final long expirationTime = rset.getLong("expiration"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SoDManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SoDManager.java index 0533d2fbcb..3497213049 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SoDManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SoDManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -100,7 +99,7 @@ public class SoDManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -168,7 +167,7 @@ public class SoDManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -194,7 +193,7 @@ public class SoDManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SoIManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SoIManager.java index 5f8258eae3..10b49e7cbb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SoIManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SoIManager.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.model.Location; @@ -76,7 +75,7 @@ public class SoIManager { return 0; } - return (GlobalVariablesManager.getInstance().getLong("SoI_opened", 0) * 1000) - Chronos.currentTimeMillis(); + return (GlobalVariablesManager.getInstance().getLong("SoI_opened", 0) * 1000) - System.currentTimeMillis(); } public static void setCurrentStage(int stage) @@ -112,7 +111,7 @@ public class SoIManager { return; } - GlobalVariablesManager.getInstance().set("SoI_opened", (Chronos.currentTimeMillis() + time) / 1000); + GlobalVariablesManager.getInstance().set("SoI_opened", (System.currentTimeMillis() + time) / 1000); LOGGER.info("Seed of Infinity Manager: Opening the seed for " + Util.formatTime((int) time / 1000)); spawnOpenedSeed(); DoorData.getInstance().getDoor(14240102).openMe(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java index b3e6532c80..c0def2e7ad 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -1114,7 +1113,7 @@ public class TerritoryWarManager implements Siegable { final Calendar cal = Calendar.getInstance(); final long nextSiegeDate = GlobalVariablesManager.getInstance().getLong(GLOBAL_VARIABLE, 0); - if (nextSiegeDate > Chronos.currentTimeMillis()) + if (nextSiegeDate > System.currentTimeMillis()) { cal.setTimeInMillis(nextSiegeDate); } @@ -1123,7 +1122,7 @@ public class TerritoryWarManager implements Siegable // Let's check if territory war date was in the past. if (cal.before(Calendar.getInstance())) { - cal.setTimeInMillis(Chronos.currentTimeMillis()); + cal.setTimeInMillis(System.currentTimeMillis()); } final boolean hasOwnedCastle = CastleManager.getInstance().hasOwnedCastle(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 46d39bc132..31954fb98f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -422,7 +421,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -519,7 +518,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - _holder.broadCastPacketToTeam(new ExCubeGameChangePoints((int) ((_startedTime - Chronos.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints())); + _holder.broadCastPacketToTeam(new ExCubeGameChangePoints((int) ((_startedTime - System.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints())); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index a579be6a5f..d31dc42ef1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -61,7 +60,7 @@ public class Lottery _prize = Config.ALT_LOTTERY_PRIZE; _isSellingTickets = false; _isStarted = false; - _enddate = Chronos.currentTimeMillis(); + _enddate = System.currentTimeMillis(); if (Config.ALLOW_LOTTERY) { (new startLottery()).run(); @@ -141,20 +140,20 @@ public class Lottery { _prize = rset.getLong("prize"); _enddate = rset.getLong("enddate"); - if (_enddate <= (Chronos.currentTimeMillis() + (2 * MINUTE))) + if (_enddate <= (System.currentTimeMillis() + (2 * MINUTE))) { (new finishLottery()).run(); return; } - if (_enddate > Chronos.currentTimeMillis()) + if (_enddate > System.currentTimeMillis()) { _isStarted = true; - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); - if (_enddate > (Chronos.currentTimeMillis() + (12 * MINUTE))) + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); + if (_enddate > (System.currentTimeMillis() + (12 * MINUTE))) { _isSellingTickets = true; - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); } return; } @@ -186,8 +185,8 @@ public class Lottery _enddate = finishtime.getTimeInMillis(); } - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CursedWeapon.java index fe93546591..a0e7ad0d87 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.TransformData; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -333,7 +332,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -351,7 +350,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -635,7 +634,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Message.java index d2c1e2b512..c0f2c3cdd3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Message.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MessageSenderType; @@ -94,7 +93,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -112,7 +111,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -132,7 +131,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Petition.java index 5e53c55f12..27da343340 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Spawn.java index 53afad4f3f..5f91655cc2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Spawn.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.NpcPersonalAIData; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -254,7 +253,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TimeStamp.java index 0523aab268..72f604df3a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -50,7 +49,7 @@ public class TimeStamp _id1 = skill.getId(); _id2 = skill.getLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -65,7 +64,7 @@ public class TimeStamp _id1 = item.getId(); _id2 = item.getObjectId(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -143,7 +142,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -161,7 +160,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/WorldObject.java index 0d264dd578..47dd91df61 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/WorldObject.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/WorldObject.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.enums.ShotType; @@ -739,7 +738,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif */ private final void sendInstanceUpdate(Instance instance, boolean hide) { - final int startTime = (int) ((Chronos.currentTimeMillis() - instance.getInstanceStartTime()) / 1000); + final int startTime = (int) ((System.currentTimeMillis() - instance.getInstanceStartTime()) / 1000); final int endTime = (int) ((instance.getInstanceEndTime() - instance.getInstanceStartTime()) / 1000); if (instance.isTimerIncrease()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5ddd4c106c..dd35f37ad8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; @@ -244,7 +243,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -253,7 +252,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java index 3762d9179d..1ec79015b6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -37,7 +37,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; @@ -2221,7 +2220,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -2351,7 +2350,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -2394,7 +2393,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java index db33de1314..372b719aa6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -251,7 +250,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java index f3f1739c47..86a5b2df06 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -46,7 +46,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -2913,7 +2912,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3968,22 +3967,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5616,7 +5615,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5649,11 +5648,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6595,7 +6594,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6814,7 +6813,7 @@ public class Player extends Playable PreparedStatement ps = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { ps.setInt(1, isOnlineInt()); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, getObjectId()); ps.execute(); } @@ -6870,7 +6869,7 @@ public class Player extends Playable ps.setInt(35, _noble ? 1 : 0); ps.setLong(36, 0); ps.setTimestamp(37, new Timestamp(_createDate.getTimeInMillis())); - ps.setLong(38, Chronos.currentTimeMillis()); // last_recom_date + ps.setLong(38, System.currentTimeMillis()); // last_recom_date ps.executeUpdate(); } catch (Exception e) @@ -6940,12 +6939,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6962,7 +6961,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7484,7 +7483,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } ps.setLong(35, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); ps.setInt(36, _newbie); @@ -7572,7 +7571,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7672,7 +7671,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7962,7 +7961,7 @@ public class Player extends Playable ps.setInt(2, _classIndex); try (ResultSet rs = ps.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rs.next()) { final int remainingTime = rs.getInt("remaining_time"); @@ -8024,7 +8023,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rs.next()) { itemId = rs.getInt("itemId"); @@ -13522,7 +13521,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -13574,7 +13573,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } public MovieHolder getMovieHolder() @@ -13592,7 +13591,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -13601,7 +13600,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13942,7 +13941,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java index 65139f17e0..476be79aa7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; @@ -172,7 +171,7 @@ public class Auctioneer extends Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -404,7 +403,7 @@ public class Auctioneer extends Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -435,7 +434,7 @@ public class Auctioneer extends Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 496007bc0f..f5a103ce4f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -147,7 +146,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 150cf94297..9ac6112319 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1061,13 +1060,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index b5351a1201..6b22cbb09d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java index ff56bde49f..52b51cc499 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.tasks.player; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class LookingForFishTask implements Runnable { _player = player; _fishGutsCheck = fishGutsCheck; - _endTaskTime = Chronos.currentTimeMillis() + (startCombatTime * 1000) + 10000; + _endTaskTime = System.currentTimeMillis() + (startCombatTime * 1000) + 10000; _fishGroup = fishGroup; _isNoob = isNoob; _isUpperGrade = isUpperGrade; @@ -48,7 +47,7 @@ public class LookingForFishTask implements Runnable { if (_player != null) { - if (Chronos.currentTimeMillis() >= _endTaskTime) + if (System.currentTimeMillis() >= _endTaskTime) { _player.endFishing(false); return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/buylist/Product.java index 32ca2a801c..ab0a5108cd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -110,7 +109,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -124,7 +123,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java index b69975176f..af525cfd85 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -488,7 +487,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_CREATE_DAYS)); + player.setClanCreateExpiryTime(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_CREATE_DAYS)); } // remove Clan skills from Player removeSkillEffects(player); @@ -526,7 +525,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember.getObjectId(), clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_CREATE_DAYS) : 0); + removeMemberInDatabase(exMember.getObjectId(), clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_CREATE_DAYS) : 0); } // Notify to scripts @@ -1067,12 +1066,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2195,7 +2194,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2207,7 +2206,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2256,7 +2255,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2292,7 +2291,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2386,12 +2385,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2444,7 +2443,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2470,7 +2469,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 2424a44a20..3562a8b5bb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -36,7 +36,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -101,7 +100,7 @@ public class Instance public Instance(int id) { _id = id; - _instanceStartTime = Chronos.currentTimeMillis(); + _instanceStartTime = System.currentTimeMillis(); } /** @@ -184,7 +183,7 @@ public class Instance } _checkTimeUpTask = ThreadPool.schedule(new CheckTimeUp(duration), 500); - _instanceEndTime = Chronos.currentTimeMillis() + duration + 500; + _instanceEndTime = System.currentTimeMillis() + duration + 500; } /** @@ -226,8 +225,8 @@ public class Instance { return; } - _lastLeft = Chronos.currentTimeMillis(); - setDuration((int) (_instanceEndTime - Chronos.currentTimeMillis() - 500)); + _lastLeft = System.currentTimeMillis(); + setDuration((int) (_instanceEndTime - System.currentTimeMillis() - 500)); } public void addNpc(Npc npc) @@ -510,7 +509,7 @@ public class Instance if (a != null) { _checkTimeUpTask = ThreadPool.schedule(new CheckTimeUp(Integer.parseInt(a.getNodeValue()) * 60000), 15000); - _instanceEndTime = Chronos.currentTimeMillis() + (Long.parseLong(a.getNodeValue()) * 60000) + 15000; + _instanceEndTime = System.currentTimeMillis() + (Long.parseLong(a.getNodeValue()) * 60000) + 15000; } break; } @@ -774,7 +773,7 @@ public class Instance } else if (_players.isEmpty() && (_emptyDestroyTime > 0)) { - final Long emptyTimeLeft = (_lastLeft + _emptyDestroyTime) - Chronos.currentTimeMillis(); + final Long emptyTimeLeft = (_lastLeft + _emptyDestroyTime) - System.currentTimeMillis(); if (emptyTimeLeft <= 0) { interval = 0; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 079a701254..20f73dcda6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.OptionData; @@ -187,7 +186,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); _enchantLevel = 0; scheduleLifeTimeTask(); } @@ -211,7 +210,7 @@ public class Item extends WorldObject setCount(1); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); } @@ -1539,7 +1538,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1762,7 +1761,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index bb4ba566b2..c9e6cff8c5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -183,12 +182,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -341,7 +340,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -428,7 +427,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index bd9c9c5b5d..20836f22d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -243,7 +242,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -252,10 +251,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -266,13 +265,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -287,7 +286,7 @@ public class ItemAuctionInstance Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { @@ -309,7 +308,7 @@ public class ItemAuctionInstance if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -324,17 +323,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -417,7 +416,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -427,7 +426,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -437,7 +436,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -447,7 +446,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -571,7 +570,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index d62f2d06a3..f550275459 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -765,7 +764,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -786,7 +785,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -800,7 +799,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index feacadfe4b..da0bbd31f9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.HeroSkillTable; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -834,7 +833,7 @@ class OlympiadGame String winner = "draw"; // Calculate Fight time - final long fightTime = (Chronos.currentTimeMillis() - _startTime); + final long fightTime = (System.currentTimeMillis() - _startTime); if ((_playerOne == null) && (_playerTwo == null)) { @@ -1001,7 +1000,7 @@ class OlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); if (_aborted) { return false; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 93136cc9e2..69911bba4a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -131,7 +130,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -147,7 +146,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, _expirationTime - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this, _expirationTime - System.currentTimeMillis()); } } @@ -225,7 +224,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(UPDATE_QUERY)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setLong(2, _id); ps.execute(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index bba81ea0be..3cb0afc993 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -38,7 +38,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -321,7 +320,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestState.java index ddbd42075d..7836da0bd3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; @@ -753,7 +752,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/AuctionableHall.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/AuctionableHall.java index 09922a45a2..384f1122cb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/AuctionableHall.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/AuctionableHall.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; @@ -98,7 +97,7 @@ public class AuctionableHall extends ClanHall public void setOwner(Clan clan) { super.setOwner(clan); - _paidUntil = Chronos.currentTimeMillis(); + _paidUntil = System.currentTimeMillis(); initialyzeTask(true); } @@ -108,20 +107,20 @@ public class AuctionableHall extends ClanHall */ private final void initialyzeTask(boolean forced) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_paidUntil > currentTime) { ThreadPool.schedule(new FeeTask(), _paidUntil - currentTime); } else if (!_paid && !forced) { - if ((Chronos.currentTimeMillis() + (3600000 * 24)) <= (_paidUntil + CH_RATE)) + if ((System.currentTimeMillis() + (3600000 * 24)) <= (_paidUntil + CH_RATE)) { - ThreadPool.schedule(new FeeTask(), Chronos.currentTimeMillis() + (3600000 * 24)); + ThreadPool.schedule(new FeeTask(), System.currentTimeMillis() + (3600000 * 24)); } else { - ThreadPool.schedule(new FeeTask(), (_paidUntil + CH_RATE) - Chronos.currentTimeMillis()); + ThreadPool.schedule(new FeeTask(), (_paidUntil + CH_RATE) - System.currentTimeMillis()); } } else @@ -140,7 +139,7 @@ public class AuctionableHall extends ClanHall { try { - final long _time = Chronos.currentTimeMillis(); + final long _time = System.currentTimeMillis(); if (isFree()) { return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index a666e5ae71..fbe941c379 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; @@ -130,7 +129,7 @@ public abstract class ClanHall { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -160,7 +159,7 @@ public abstract class ClanHall if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index 0c5370dbb0..f4639c57a3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.AuctionItemType; @@ -146,7 +145,7 @@ public class ClanHallAuction public ClanHallAuction(int itemId, Clan clan, long delay, long bid, String name) { _id = itemId; - _endDate = Chronos.currentTimeMillis() + delay; + _endDate = System.currentTimeMillis() + delay; _itemId = itemId; _itemName = name; _itemType = "ClanHall"; @@ -221,7 +220,7 @@ public class ClanHallAuction /** Task Manage */ private void startAutoTask() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long taskDelay = 0; if (_endDate <= currentTime) { @@ -343,7 +342,7 @@ public class ClanHallAuction ps.setInt(1, bidder.getClanId()); ps.setString(2, bidder.getClan().getLeaderName()); ps.setLong(3, bid); - ps.setLong(4, Chronos.currentTimeMillis()); + ps.setLong(4, System.currentTimeMillis()); ps.setInt(5, _id); ps.setInt(6, bidder.getClanId()); ps.execute(); @@ -359,7 +358,7 @@ public class ClanHallAuction ps.setString(4, bidder.getName()); ps.setLong(5, bid); ps.setString(6, bidder.getClan().getName()); - ps.setLong(7, Chronos.currentTimeMillis()); + ps.setLong(7, System.currentTimeMillis()); ps.execute(); } if (World.getInstance().getPlayer(_highestBidderName) != null) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java index a5bc5a8fed..44824a0bf4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.AutoSpawnHandler; @@ -498,7 +497,7 @@ public class SevenSigns public long getMilliToPeriodChange() { - return (_nextPeriodChange.getTimeInMillis() - Chronos.currentTimeMillis()); + return (_nextPeriodChange.getTimeInMillis() - System.currentTimeMillis()); } protected void setCalendarForNextPeriodChange() diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java index 0cc7b1b13d..f676c2ba4d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; @@ -1230,12 +1229,12 @@ public class SevenSignsFestival implements SpawnListener public void setNextCycleStart() { - _nextFestivalCycleStart = Chronos.currentTimeMillis() + Config.ALT_FESTIVAL_CYCLE_LENGTH; + _nextFestivalCycleStart = System.currentTimeMillis() + Config.ALT_FESTIVAL_CYCLE_LENGTH; } public void setNextFestivalStart(long milliFromNow) { - _nextFestivalStart = Chronos.currentTimeMillis() + milliFromNow; + _nextFestivalStart = System.currentTimeMillis() + milliFromNow; } public long getMinsToNextCycle() @@ -1244,7 +1243,7 @@ public class SevenSignsFestival implements SpawnListener { return -1; } - return (_nextFestivalCycleStart - Chronos.currentTimeMillis()) / 60000; + return (_nextFestivalCycleStart - System.currentTimeMillis()) / 60000; } public int getMinsToNextFestival() @@ -1253,7 +1252,7 @@ public class SevenSignsFestival implements SpawnListener { return -1; } - return (int) (((_nextFestivalStart - Chronos.currentTimeMillis()) / 60000) + 1); + return (int) (((_nextFestivalStart - System.currentTimeMillis()) / 60000) + 1); } public String getTimeToNextFestivalStr() @@ -1554,7 +1553,7 @@ public class SevenSignsFestival implements SpawnListener } // Update the highest scores and party list. - currFestData.set("date", String.valueOf(Chronos.currentTimeMillis())); + currFestData.set("date", String.valueOf(System.currentTimeMillis())); currFestData.set("score", offeringScore); currFestData.set("members", Util.implodeString(partyMembers, ",")); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Castle.java index cc4d62eb7a..d2f4eb564c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -160,7 +159,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -195,7 +194,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java index 86c0e5f74a..7dd09b812b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -163,7 +162,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -193,7 +192,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -580,7 +579,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -786,7 +785,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -912,12 +911,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index b7e28de80f..1a7391fc1d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.FortTeleportWhoType; @@ -714,12 +713,12 @@ public class FortSiege implements Siegable return 1; // Player dont havee enough adena to register } - else if ((Chronos.currentTimeMillis() < TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isRegistrationOver()) + else if ((System.currentTimeMillis() < TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isRegistrationOver()) { return 2; // Is not right time to register Fortress now } - if ((Chronos.currentTimeMillis() > TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isTWChannelOpen()) + if ((System.currentTimeMillis() > TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isTWChannelOpen()) { return 2; // Is not right time to register Fortress now } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Siege.java index b55eb41033..12bc464ac2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; import org.l2jmobius.gameserver.enums.PlayerCondOverride; @@ -1414,9 +1413,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/clanhalls/ClanHallSiegeEngine.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/clanhalls/ClanHallSiegeEngine.java index 48f3ebbe6c..e28b4d0609 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/clanhalls/ClanHallSiegeEngine.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/clanhalls/ClanHallSiegeEngine.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.SiegeClanType; @@ -87,7 +86,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable _hall = CHSiegeManager.getInstance().getSiegableHall(hallId); _hall.setSiege(this); - _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - Chronos.currentTimeMillis() - 3600000); + _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000); LOGGER.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime() + "."); loadAttackers(); } @@ -402,7 +401,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable onSiegeEnds(); - _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - Chronos.currentTimeMillis() - 3600000); + _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000); LOGGER.config("Siege of " + _hall.getName() + " scheduled for " + _hall.getSiegeDate().getTime() + "."); _hall.updateSiegeStatus(SiegeStatus.REGISTERING); unSpawnSiegeGuards(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/clanhalls/SiegableHall.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/clanhalls/SiegableHall.java index 872394626c..5d3d4c9428 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/clanhalls/SiegableHall.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/clanhalls/SiegableHall.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.SiegeClanType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; @@ -83,7 +82,7 @@ public class SiegableHall extends ClanHall _nextSiege = Calendar.getInstance(); final long nextSiege = set.getLong("nextSiege"); - if ((nextSiege - Chronos.currentTimeMillis()) < 0) + if ((nextSiege - System.currentTimeMillis()) < 0) { updateNextSiege(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java index a4372fbc80..ca05265b71 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -166,7 +165,7 @@ public class BossZone extends ZoneType // with legal entries, do nothing. if (expirationTime == null) // legal null expirationTime entries { - if (GameServer.dateTimeServerStarted.getTimeInMillis() > (Chronos.currentTimeMillis() - _timeInvade)) + if (GameServer.dateTimeServerStarted.getTimeInMillis() > (System.currentTimeMillis() - _timeInvade)) { return; } @@ -175,7 +174,7 @@ public class BossZone extends ZoneType { // legal non-null logoutTime entries getSettings().getPlayerAllowedReEntryTimes().remove(player.getObjectId()); - if (expirationTime.longValue() > Chronos.currentTimeMillis()) + if (expirationTime.longValue() > System.currentTimeMillis()) { return; } @@ -238,7 +237,7 @@ public class BossZone extends ZoneType if (!player.isOnline() && getSettings().getPlayersAllowed().contains(player.getObjectId())) { // mark the time that the player left the zone - getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), Chronos.currentTimeMillis() + _timeInvade); + getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), System.currentTimeMillis() + _timeInvade); } else { @@ -405,7 +404,7 @@ public class BossZone extends ZoneType { getSettings().getPlayersAllowed().add(player.getObjectId()); } - getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), Chronos.currentTimeMillis() + (durationInSec * 1000)); + getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), System.currentTimeMillis() + (durationInSec * 1000)); } public void removePlayer(Player player) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java index 51682ec596..b8d99c69e1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -314,7 +313,7 @@ public class GameClient extends ChannelInboundHandler { try (PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 76490ee804..192c962173 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -81,7 +80,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index a3ac6e3815..1a6ee7dd57 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -62,7 +61,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 1f4e325c54..77a79cd8dd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -372,7 +371,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.ENABLE_VITALITY && Config.RECOVER_VITALITY_ON_RECONNECT) { - final float points = (Config.RATE_RECOVERY_ON_RECONNECT * (Chronos.currentTimeMillis() - player.getLastAccess())) / 60000; + final float points = (Config.RATE_RECOVERY_ON_RECONNECT * (System.currentTimeMillis() - player.getLastAccess())) / 60000; if (points > 0) { player.updateVitalityPoints(points, false, true); @@ -538,7 +537,7 @@ public class EnterWorld implements IClientIncomingPacket DimensionalRiftManager.getInstance().teleportToWaitingRoom(player); } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } @@ -599,7 +598,7 @@ public class EnterWorld implements IClientIncomingPacket } final Calendar now = Calendar.getInstance(); - now.setTimeInMillis(Chronos.currentTimeMillis()); + now.setTimeInMillis(System.currentTimeMillis()); if ((nextBirthday == null) || (Integer.parseInt(nextBirthday) == now.get(Calendar.YEAR))) { player.sendPacket(SystemMessageId.HAPPY_BIRTHDAY_ALEGRIA_HAS_SENT_YOU_A_BIRTHDAY_GIFT); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 53e3530035..6f4f799e45 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.nio.BufferUnderflowException; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.model.Location; @@ -77,7 +76,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 35121d5eda..6750f14457 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -118,7 +117,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((player.getActiveEnchantTimestamp() == 0) || ((Chronos.currentTimeMillis() - player.getActiveEnchantTimestamp()) < 2000)) + if ((player.getActiveEnchantTimestamp() == 0) || ((System.currentTimeMillis() - player.getActiveEnchantTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 900f320aee..63fc7d9576 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 95e26fa980..44f3a72f4f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; @@ -75,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } player.setEnchanting(true); - player.setActiveEnchantTimestamp(Chronos.currentTimeMillis()); + player.setActiveEnchantTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java index 1e1c8cfdf6..a920d9cc32 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -81,7 +80,7 @@ public class RequestJoinDominionWar implements IClientIncomingPacket if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index 60546bb867..bf06a31ef2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CHSiegeManager; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -74,7 +73,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; @@ -100,7 +99,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index aaf2cb1de3..28ba1388ca 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 2b9edcb0ea..dc68a12536 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -20,7 +20,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -83,8 +82,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index af09102efa..af3af505f0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -69,7 +68,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index af104f3a4e..b880bd4aa4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index aab2e59c53..bdce4a5e28 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -20,7 +20,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -64,7 +63,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index a3840b218f..e0fca04589 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.World; @@ -133,7 +132,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(Math.min(charInfoPackage.getEnchantEffect(), 127)); @@ -206,7 +205,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index df8e898143..0caab2379f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index df253d3e90..31057e9afe 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index c78f0085db..ac49b97063 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CHSiegeManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -96,7 +95,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c974b33ae..b9877d2c78 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -36,7 +35,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if (_currentTime < ts.getStamp()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index cbbceb067e..bdc222ff1e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Cubic; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -111,7 +110,7 @@ public class AttackStanceTaskManager implements Runnable } } } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 90455cd4eb..c9d4a889f2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +86,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -145,7 +144,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -156,7 +155,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index d7d41a53d0..0717347630 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index a5d33d8798..fe15ab7233 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskClanLeaderApply; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; @@ -101,7 +100,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -255,7 +254,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -306,7 +305,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8627f6b73b..b48719953c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index aa36e526a8..fcbbd3f84e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -139,7 +138,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java index 90ca7077ee..2ff46a5410 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.loginserver.GameServerTable; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; import org.l2jmobius.loginserver.network.LoginClient; @@ -167,7 +166,7 @@ public class ServerList implements IOutgoingPacket packet.writeC(_charsToDelete.get(servId).length); for (long deleteTime : _charsToDelete.get(servId)) { - packet.writeD((int) ((deleteTime - Chronos.currentTimeMillis()) / 1000)); + packet.writeD((int) ((deleteTime - System.currentTimeMillis()) / 1000)); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java index ad687b4064..ab6ed54fec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -138,7 +137,7 @@ public class Parade extends AbstractNpcAI // final long diff = timeLeftMilli(8, 0, 0), cycle = 600000; // ThreadPoolManager.scheduleAtFixedRate(new Start(), 180000, cycle); - LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); + LOGGER.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours."); } void load() diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java index 46c787b7e9..aced8b0b46 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Location; @@ -304,7 +303,7 @@ public class TalentShow extends AbstractNpcAI hourDiff *= 3600000; minDiff *= 60000; diff = hourDiff + minDiff; - LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(Chronos.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); + LOGGER.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours."); startQuestTimer("Start", diff, null, null); // first start } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java index e7524bffd5..5903eee978 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java @@ -19,7 +19,6 @@ package ai.areas.Gracia.AI; import java.util.Calendar; import java.util.GregorianCalendar; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.Movie; @@ -128,7 +127,7 @@ public class Lindvior extends AbstractNpcAI final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); date.set(Calendar.HOUR_OF_DAY, RESET_HOUR); - if (Chronos.currentTimeMillis() >= date.getTimeInMillis()) + if (System.currentTimeMillis() >= date.getTimeInMillis()) { date.add(Calendar.DAY_OF_WEEK, 1); } @@ -146,6 +145,6 @@ public class Lindvior extends AbstractNpcAI { date.add(Calendar.DAY_OF_WEEK, 1 + RESET_DAY_1); } - return date.getTimeInMillis() - Chronos.currentTimeMillis(); + return date.getTimeInMillis() - System.currentTimeMillis(); } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java index c6e42dd24c..1b76216e7c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; @@ -228,7 +227,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI int buffsNow = 0; final Long var = GlobalVariablesManager.getInstance().getLong("SeedNextStatusChange", 0); - if (var < Chronos.currentTimeMillis()) + if (var < System.currentTimeMillis()) { buffsNow = getRandom(ZONE_BUFFS_LIST.length); GlobalVariablesManager.getInstance().set("SeedBuffsList", String.valueOf(buffsNow)); @@ -253,7 +252,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI reenter.set(Calendar.MINUTE, 0); reenter.set(Calendar.HOUR_OF_DAY, 13); reenter.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 7); } @@ -271,7 +270,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI } ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } private void spawnGroupOfMinion(Monster npc, int[] mobIds) @@ -317,7 +316,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI zone.clearSkills(); zone.addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1); } - startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - Chronos.currentTimeMillis(), null, null); + startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null); } else if (event.equalsIgnoreCase("transform")) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index a571c389fc..470c61ddc4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -285,7 +284,7 @@ public class HallOfErosionAttack extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(2100); sm.addPcName(partyMember); @@ -323,7 +322,7 @@ public class HallOfErosionAttack extends AbstractNpcAI { world = new HEAWorld(); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); - ((HEAWorld) world).startTime = Chronos.currentTimeMillis(); + ((HEAWorld) world).startTime = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); LOGGER.info("Hall Of Erosion Attack started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isInParty()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java index 2c530995bb..16ccb77a3e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -287,7 +286,7 @@ public class HallOfErosionDefence extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(2100); sm.addPcName(partyMember); @@ -325,7 +324,7 @@ public class HallOfErosionDefence extends AbstractNpcAI { world = new HEDWorld(); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); - ((HEDWorld) world).startTime = Chronos.currentTimeMillis(); + ((HEDWorld) world).startTime = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); LOGGER.info("Hall Of Erosion Defence started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); if (player.isInParty()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java index 4584b3e72e..b3d14206ab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -181,7 +180,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); @@ -227,7 +226,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI { world = new HSAWorld(); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); - ((HSAWorld) world).storeTime[0] = Chronos.currentTimeMillis(); + ((HSAWorld) world).storeTime[0] = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); LOGGER.info("Hall Of Suffering Attack started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); runTumors((HSAWorld) world); @@ -517,7 +516,7 @@ public class HallOfSufferingAttack extends AbstractNpcAI && (world.klanikus.isDead() && world.klodekus.isDead())) { world.incStatus(); - world.storeTime[1] = Chronos.currentTimeMillis(); + world.storeTime[1] = System.currentTimeMillis(); final Long finishDiff = world.storeTime[1] - world.storeTime[0]; if (finishDiff < 1260000) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java index cace87e64d..5885e44829 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -181,7 +180,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); @@ -227,7 +226,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI { world = new HSDWorld(); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCEID)); - ((HSDWorld) world).storeTime[0] = Chronos.currentTimeMillis(); + ((HSDWorld) world).storeTime[0] = System.currentTimeMillis(); InstanceManager.getInstance().addWorld(world); LOGGER.info("Hall Of Suffering Defence started " + INSTANCEID + " Instance: " + world.getInstanceId() + " created by player: " + player.getName()); runTumors((HSDWorld) world); @@ -517,7 +516,7 @@ public class HallOfSufferingDefence extends AbstractNpcAI && (world.klanikus.isDead() && world.klodekus.isDead())) { world.incStatus(); - world.storeTime[1] = Chronos.currentTimeMillis(); + world.storeTime[1] = System.currentTimeMillis(); final Long finishDiff = world.storeTime[1] - world.storeTime[0]; if (finishDiff < 1260000) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index 5f3238dac3..382a1a2275 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -23,7 +23,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -285,7 +284,7 @@ public class HeartInfinityAttack extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(2100); sm.addPcName(partyMember); @@ -404,7 +403,7 @@ public class HeartInfinityAttack extends AbstractNpcAI world.ekimus.broadcastPacket(new NpcSay(world.ekimus.getObjectId(), ChatType.SHOUT, world.ekimus.getId(), NpcStringId.I_SHALL_ACCEPT_YOUR_CHALLENGE_S1_COME_AND_DIE_IN_THE_ARMS_OF_IMMORTALITY)); world.hounds.add(addSpawn(HOUND, -179224, 209624, -15504, 16384, false, 0, false, world.getInstanceId())); world.hounds.add(addSpawn(HOUND, -179880, 209464, -15504, 16384, false, 0, false, world.getInstanceId())); - world.startTime = Chronos.currentTimeMillis(); + world.startTime = System.currentTimeMillis(); world.timerTask = ThreadPool.scheduleAtFixedRate(new TimerTask(world), 298 * 1000, 5 * 60 * 1000); } @@ -667,7 +666,7 @@ public class HeartInfinityAttack extends AbstractNpcAI @Override public void run() { - final long time = ((_world.startTime + (25 * 60 * 1000)) - Chronos.currentTimeMillis()) / 60000; + final long time = ((_world.startTime + (25 * 60 * 1000)) - System.currentTimeMillis()) / 60000; if (time == 0) { broadCastPacket(_world, new ExShowScreenMessage(NpcStringId.YOU_HAVE_FAILED_AT_S1_S2_THE_INSTANCE_WILL_SHORTLY_EXPIRE, 2, 8000)); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java index cfb1465679..3a0a069c5d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java @@ -22,7 +22,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -305,7 +304,7 @@ public class HeartInfinityDefence extends AbstractNpcAI } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(2100); sm.addPcName(partyMember); @@ -361,7 +360,7 @@ public class HeartInfinityDefence extends AbstractNpcAI } } } - ((HIDWorld) world).startTime = Chronos.currentTimeMillis(); + ((HIDWorld) world).startTime = System.currentTimeMillis(); ((HIDWorld) world).finishTask = ThreadPool.schedule(new FinishTask((HIDWorld) world), 30 * 60000); ((HIDWorld) world).timerTask = ThreadPool.scheduleAtFixedRate(new TimerTask((HIDWorld) world), 298 * 1000, 5 * 60 * 1000); conquestBegins((HIDWorld) world); @@ -631,7 +630,7 @@ public class HeartInfinityDefence extends AbstractNpcAI @Override public void run() { - final long time = ((_world.startTime + (25 * 60 * 1000)) - Chronos.currentTimeMillis()) / 60000; + final long time = ((_world.startTime + (25 * 60 * 1000)) - System.currentTimeMillis()) / 60000; if (time == 0) { conquestConclusion(_world); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java index 36cd836c99..3af75bfe87 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -853,7 +852,7 @@ public class SeedOfDestruction extends AbstractNpcAI return false; } final Long reentertime = InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), INSTANCE_ID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = (new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET)); sm.addPcName(channelMember); @@ -901,7 +900,7 @@ public class SeedOfDestruction extends AbstractNpcAI return 0; } - world = new SODWorld(Chronos.currentTimeMillis() + 5400000); + world = new SODWorld(System.currentTimeMillis() + 5400000); world.setInstance(InstanceManager.getInstance().createDynamicInstance(INSTANCE_ID)); InstanceManager.getInstance().addWorld(world); spawnState((SODWorld) world); @@ -921,7 +920,7 @@ public class SeedOfDestruction extends AbstractNpcAI if (player.getParty() == null) { player.sendMessage("Welcome to Seed of Destruction. Time to finish the instance is 130 minutes."); - InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCE_ID, (Chronos.currentTimeMillis())); + InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCE_ID, (System.currentTimeMillis())); teleportplayer(player, teleto, (SODWorld) world); if (InstanceManager.getInstance().getInstance(instanceId).isRemoveBuffEnabled()) { @@ -934,7 +933,7 @@ public class SeedOfDestruction extends AbstractNpcAI for (Player channelMember : player.getParty().getCommandChannel().getMembers()) { player.sendMessage("Welcome to Seed of Destruction. Time to finish the instance is 130 minutes."); - InstanceManager.getInstance().setInstanceTime(channelMember.getObjectId(), INSTANCE_ID, (Chronos.currentTimeMillis())); + InstanceManager.getInstance().setInstanceTime(channelMember.getObjectId(), INSTANCE_ID, (System.currentTimeMillis())); teleportplayer(channelMember, teleto, (SODWorld) world); if (InstanceManager.getInstance().getInstance(instanceId).isRemoveBuffEnabled()) { @@ -948,7 +947,7 @@ public class SeedOfDestruction extends AbstractNpcAI for (Player partyMember : player.getParty().getMembers()) { player.sendMessage("Welcome to Seed of Destruction. Time to finish the instance is 130 minutes."); - InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCE_ID, (Chronos.currentTimeMillis())); + InstanceManager.getInstance().setInstanceTime(partyMember.getObjectId(), INSTANCE_ID, (System.currentTimeMillis())); teleportplayer(partyMember, teleto, (SODWorld) world); if (InstanceManager.getInstance().getInstance(instanceId).isRemoveBuffEnabled()) { @@ -1121,7 +1120,7 @@ public class SeedOfDestruction extends AbstractNpcAI reenter.set(Calendar.MINUTE, RESET_MIN); reenter.set(Calendar.HOUR_OF_DAY, RESET_HOUR); // if time is >= RESET_HOUR - roll to the next day - if (reenter.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (reenter.getTimeInMillis() <= System.currentTimeMillis()) { reenter.add(Calendar.DAY_OF_MONTH, 1); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java index 010b58a2aa..9d1fed3975 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java @@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -799,7 +798,7 @@ public class TowerOfNaia extends AbstractNpcAI private void markElpyRespawn() { - final long respawnTime = (getRandom(43200, 216000) * 1000) + Chronos.currentTimeMillis(); + final long respawnTime = (getRandom(43200, 216000) * 1000) + System.currentTimeMillis(); GlobalVariablesManager.getInstance().set("elpy_respawn_time", respawnTime); } @@ -823,13 +822,13 @@ public class TowerOfNaia extends AbstractNpcAI private void spawnElpy() { final long respawnTime = GlobalVariablesManager.getInstance().getLong("elpy_respawn_time", 0); - if (respawnTime <= Chronos.currentTimeMillis()) + if (respawnTime <= System.currentTimeMillis()) { addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false); } else { - ThreadPool.schedule(() -> addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false), respawnTime - Chronos.currentTimeMillis()); + ThreadPool.schedule(() -> addSpawn(MUTATED_ELPY, -45474, 247450, -13994, 49152, false, 0, false), respawnTime - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java index 511f02bae3..52f0ad6558 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/DemonPrinceFloor/DemonPrinceFloor.java @@ -16,7 +16,6 @@ */ package ai.areas.Hellbound.Instances.DemonPrinceFloor; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -144,7 +143,7 @@ public class DemonPrinceFloor extends AbstractInstance } final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { party.broadcastPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addPcName(partyMember)); return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java index 64a0d77a4c..79c58c839b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/RankuFloor/RankuFloor.java @@ -16,7 +16,6 @@ */ package ai.areas.Hellbound.Instances.RankuFloor; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -142,7 +141,7 @@ public class RankuFloor extends AbstractInstance } final Long reenterTime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID); - if (Chronos.currentTimeMillis() < reenterTime) + if (System.currentTimeMillis() < reenterTime) { party.broadcastPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addPcName(partyMember)); return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java index a0f0813716..fc9ca1bc2d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java @@ -19,7 +19,6 @@ package ai.areas.Rune.RuneCastle.Venom; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -111,7 +110,7 @@ public class Venom extends AbstractNpcAI setCastleSiegeStartId(this::onSiegeStart, CASTLE); setCastleSiegeFinishId(this::onSiegeFinish, CASTLE); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis(); if ((currentTime > (startSiegeDate - (HOURS_BEFORE * 360000))) && (currentTime < startSiegeDate)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 1fea5488bd..8983cae070 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -169,14 +168,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -272,7 +271,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -367,7 +366,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -619,7 +618,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -767,7 +766,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e17555aa12..24a3453a9c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.enums.ChatType; @@ -136,7 +135,7 @@ public class Baium extends AbstractNpcAI { _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -149,7 +148,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -209,7 +208,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, null); startQuestTimer("SOCIAL_ACTION", 10000, _baium, player); @@ -374,7 +373,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { cancelQuestTimers("SELECT_TARGET"); notifyEvent("CLEAR_ZONE", null, null); @@ -383,7 +382,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -484,7 +483,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -660,7 +659,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", System.currentTimeMillis() + respawnTime); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java index a776542a9e..caebf5f9b5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -110,7 +109,7 @@ public class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -351,7 +350,7 @@ public class Beleth extends AbstractNpcAI c.setImmobilized(false); } - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, null, null); startQuestTimer("SPAWN25", 60000, null, null); break; @@ -509,7 +508,7 @@ public class Beleth extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((_lastAttack + 900000) < Chronos.currentTimeMillis()) + if ((_lastAttack + 900000) < System.currentTimeMillis()) { GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE); for (Creature creature : ZONE.getCharactersInside()) @@ -709,7 +708,7 @@ public class Beleth extends AbstractNpcAI GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD); final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000; final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(REAL_BELETH, info); startQuestTimer("BELETH_UNLOCK", respawnTime, null, null); deleteAll(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java index c7aa81c046..eb7e6b2a9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -88,7 +87,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -205,7 +204,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java index 3758761cfb..f58312bd19 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java @@ -16,7 +16,6 @@ */ package ai.bosses.DrChaos; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -68,7 +67,7 @@ public class DrChaos extends AbstractNpcAI // Load the reset date and time for Dr. Chaos from DB. if (status == DEAD) { - final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); if (temp > 0) { startQuestTimer("reset_drchaos", temp, null, null, false); @@ -97,7 +96,7 @@ public class DrChaos extends AbstractNpcAI golem.setRunning(); // start monitoring Dr. Chaos's inactivity - _lastAttackVsGolem = Chronos.currentTimeMillis(); + _lastAttackVsGolem = System.currentTimeMillis(); startQuestTimer("golem_despawn", 60000, golem, null, true); } // Spawn the regular NPC. @@ -118,7 +117,7 @@ public class DrChaos extends AbstractNpcAI // despawn the live Dr. Chaos after 30 minutes of inactivity else if (event.equalsIgnoreCase("golem_despawn") && (npc != null)) { - if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < Chronos.currentTimeMillis())) + if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis())) { final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more @@ -156,7 +155,7 @@ public class DrChaos extends AbstractNpcAI golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0)); // start monitoring Dr. Chaos's inactivity - _lastAttackVsGolem = Chronos.currentTimeMillis(); + _lastAttackVsGolem = System.currentTimeMillis(); startQuestTimer("golem_despawn", 60000, golem, null, true); // Delete Dr. Chaos after spawned the war golem. @@ -242,7 +241,7 @@ public class DrChaos extends AbstractNpcAI // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info); return null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 4031b57cea..a7a3b7fdd9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -92,7 +91,7 @@ public class Orfen extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -326,7 +325,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 5f2971487f..58b872a5a1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.Location; @@ -94,7 +93,7 @@ public class QueenAnt extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -355,7 +354,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java index 3181fd8225..c26218a8f4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/QueenShyeed/QueenShyeed.java @@ -16,7 +16,6 @@ */ package ai.bosses.QueenShyeed; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -86,7 +85,7 @@ public class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final long respawn = GlobalVariablesManager.getInstance().getLong("QueenShyeedRespawn", 0); - final long remain = respawn != 0 ? respawn - Chronos.currentTimeMillis() : 0; + final long remain = respawn != 0 ? respawn - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); @@ -102,7 +101,7 @@ public class QueenShyeed extends AbstractNpcAI private void startRespawn() { final int respawnTime = RESPAWN - getRandom(RANDOM_RESPAWN); - GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(Chronos.currentTimeMillis() + respawnTime)); + GlobalVariablesManager.getInstance().set("QueenShyeedRespawn", Long.toString(System.currentTimeMillis() + respawnTime)); startQuestTimer("respawn", respawnTime, null, null); // MOB_BUFF_ZONE.setEnabled(false); MOB_BUFF_DISPLAY_ZONE.setEnabled(false); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f9b7ee12ac..4843e1b1c9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 67c59fa89b..0a30150197 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -129,7 +128,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -168,7 +167,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -196,7 +195,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -220,7 +219,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -416,7 +415,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -447,7 +446,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java index a1df1941c8..0a25e5fbf5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PriestOfBlessing/PriestOfBlessing.java @@ -16,7 +16,6 @@ */ package ai.others.PriestOfBlessing; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -111,15 +110,15 @@ public class PriestOfBlessing extends AbstractNpcAI { final String value = player.getVariables().getString("PriestOfBlessing_voice", ""); final long reuseTime = value.isEmpty() ? 0 : Long.parseLong(value); - if (Chronos.currentTimeMillis() > reuseTime) + if (System.currentTimeMillis() > reuseTime) { takeItems(player, Inventory.ADENA_ID, PRICE_VOICE); giveItems(player, NEVIT_VOICE, 1); - player.getVariables().set("PriestOfBlessing_voice", Long.toString(Chronos.currentTimeMillis() + (20 * 3600000))); + player.getVariables().set("PriestOfBlessing_voice", Long.toString(System.currentTimeMillis() + (20 * 3600000))); } else { - final long remainingTime = (reuseTime - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuseTime - System.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); @@ -140,17 +139,17 @@ public class PriestOfBlessing extends AbstractNpcAI { final String value = player.getVariables().getString("PriestOfBlessing_hg_" + index, ""); final long reuseTime = value.isEmpty() ? 0 : Long.parseLong(value); - if (Chronos.currentTimeMillis() > reuseTime) + if (System.currentTimeMillis() > reuseTime) { final int[] hg = HOURGLASSES[index]; final int nevitHourglass = hg[getRandom(0, hg.length - 1)]; takeItems(player, Inventory.ADENA_ID, priceHourglass); giveItems(player, nevitHourglass, 1); - player.getVariables().set("PriestOfBlessing_hg_" + index, Long.toString(Chronos.currentTimeMillis() + (20 * 3600000))); + player.getVariables().set("PriestOfBlessing_hg_" + index, Long.toString(System.currentTimeMillis() + (20 * 3600000))); } else { - final long remainingTime = (reuseTime - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuseTime - System.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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index 6859df61db..9bb03a27d8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.SpawnTable; @@ -181,7 +180,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine // XXX _rainbow.siegeEnds(); ThreadPool.schedule(new SetFinalAttackers(), _rainbow.getNextSiegeTime()); - setRegistrationEndString((_rainbow.getNextSiegeTime() + Chronos.currentTimeMillis()) - 3600000); + setRegistrationEndString((_rainbow.getNextSiegeTime() + System.currentTimeMillis()) - 3600000); // Teleport out of the arenas is made 2 mins after game ends ThreadPool.schedule(new TeleportBack(), 120000); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index f96700c017..f36aae0fd1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -16,7 +16,6 @@ */ 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; @@ -80,7 +79,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getQuestItemsCount(player, Inventory.ADENA_ID) > 1) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long reuseTime = player.getVariables().getLong(RESET_VAR, 0); if (currentTime > reuseTime) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 7f73817dfc..734cda5237 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -16,7 +16,6 @@ */ package events.GiftOfVitality; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -94,9 +93,9 @@ public class GiftOfVitality extends LongTimeEvent case "vitality": { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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 +109,7 @@ public class GiftOfVitality extends LongTimeEvent { player.doCast(GIFT_OF_VITALITY.getSkill()); player.doSimultaneousCast(JOY_OF_VITALITY.getSkill()); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); htmltext = "4306-okvitality.htm"; } break; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 54eb3f3065..4fa731a370 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -16,7 +16,6 @@ */ package events.LoveYourGatekeeper; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; @@ -59,9 +58,9 @@ public class LoveYourGatekeeper extends LongTimeEvent if (player.getAdena() >= PRICE) { final long reuse = player.getVariables().getLong(REUSE, 0); - if (reuse > Chronos.currentTimeMillis()) + if (reuse > System.currentTimeMillis()) { - final long remainingTime = (reuse - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (reuse - System.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); @@ -74,7 +73,7 @@ public class LoveYourGatekeeper extends LongTimeEvent { takeItems(player, Inventory.ADENA_ID, PRICE); giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1); - player.getVariables().set(REUSE, Chronos.currentTimeMillis() + (HOURS * 3600000)); + player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000)); } } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 9231330020..52c8d0c693 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -16,7 +16,6 @@ */ package events.MasterOfEnchanting; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -87,7 +86,7 @@ public class MasterOfEnchanting extends LongTimeEvent } else if (event.equalsIgnoreCase("buy_scroll_24")) { - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) @@ -101,7 +100,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else @@ -135,7 +134,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(Chronos.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + player.getVariables().set("MasterOfEnchanting", Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); htmltext = "32599-scroll24.htm"; } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java index 0263e13bf2..45a765cb42 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.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; @@ -326,7 +325,7 @@ public class SavingSanta extends LongTimeEvent { if (_rewardedPlayers.containsKey(pl.getAccountName())) { - final long elapsedTimeSinceLastRewarded = Chronos.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); + final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName()); if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS) { continue; @@ -335,7 +334,7 @@ public class SavingSanta extends LongTimeEvent else { final long time = player.getVariables().getLong("LAST_SANTA_REWARD", 0); - if ((Chronos.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) + if ((System.currentTimeMillis() - time) < MIN_TIME_BETWEEN_2_REWARDS) { _rewardedPlayers.put(pl.getAccountName(), time); continue; @@ -345,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(), Chronos.currentTimeMillis()); - player.getVariables().set("LAST_SANTA_REWARD", Chronos.currentTimeMillis()); + _rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis()); + player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis()); startQuestTimer("SantaRewarding0", 500, santa, pl); } } @@ -439,7 +438,7 @@ public class SavingSanta extends LongTimeEvent else if (event.equalsIgnoreCase("SantaBlessings") && SANTAS_HELPER_AUTOBUFF) { startQuestTimer("SantaBlessings", 15000, null, null); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Npc santaHelper1 : _santaHelpers) { for (Player plb : World.getInstance().getVisibleObjects(santaHelper1, Player.class)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java index 6f661bf9d1..a6b264974b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.CHSiegeManager; @@ -164,7 +163,7 @@ public class AdminCHSiege implements IAdminCommandHandler c.set(Calendar.HOUR_OF_DAY, h); c.set(Calendar.MINUTE, min); c.set(Calendar.SECOND, 0); - if (c.getTimeInMillis() > Chronos.currentTimeMillis()) + if (c.getTimeInMillis() > System.currentTimeMillis()) { activeChar.sendMessage(hall.getName() + " siege: " + c.getTime()); hall.setNextSiegeDate(c.getTimeInMillis()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index 498d89bc50..beb4561e6e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index 0d35a4b0a9..addbb3ee85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ package handlers.admincommandhandlers; import java.util.Calendar; import java.util.StringTokenizer; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.SoDManager; import org.l2jmobius.gameserver.instancemanager.SoIManager; @@ -74,7 +73,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (SoDManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + SoDManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + SoDManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 46e005b854..865a35881b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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; @@ -125,7 +124,7 @@ public class AdminInstanceZone implements IAdminCommandHandler { int hours = 0; int minutes = 0; - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 9f76aafa46..5888942445 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java index 9a9e38bd74..1a5c131dc5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java @@ -20,7 +20,6 @@ import java.util.Calendar; import java.util.Collection; import java.util.StringTokenizer; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; @@ -117,11 +116,11 @@ public class AdminTerritoryWar implements IAdminCommandHandler } else if (command.equalsIgnoreCase("admin_territory_war_start")) { - TerritoryWarManager.getInstance().setTWStartTimeInMillis(Chronos.currentTimeMillis()); + TerritoryWarManager.getInstance().setTWStartTimeInMillis(System.currentTimeMillis()); } else if (command.equalsIgnoreCase("admin_territory_war_end")) { - TerritoryWarManager.getInstance().setTWStartTimeInMillis(Chronos.currentTimeMillis() - TerritoryWarManager.WARLENGTH); + TerritoryWarManager.getInstance().setTWStartTimeInMillis(System.currentTimeMillis() - TerritoryWarManager.WARLENGTH); } else if (command.equalsIgnoreCase("admin_territory_wards_list")) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 3f6cabdc22..d9717c3bcd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index ad53c3f681..70e687ad5c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -46,7 +45,7 @@ public class ClanPenalty implements IUserCommandHandler final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +53,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +61,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java index 8f3e31646e..9c85778f93 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java @@ -19,7 +19,6 @@ package handlers.usercommandhandlers; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +65,7 @@ public class InstanceZone implements IUserCommandHandler { for (Entry entry : instanceTimes.entrySet()) { - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 60) { if (firstMessage) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index 38985c1d43..7dcfa2ac86 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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 +102,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java index 3181e80fa7..9eaa4cdc38 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.InstanceReenterType; import org.l2jmobius.gameserver.enums.SkillFinishType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -131,7 +130,7 @@ public abstract class AbstractInstance extends AbstractNpcAI { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -141,7 +140,7 @@ public abstract class AbstractInstance extends AbstractNpcAI calendar.set(Calendar.MINUTE, data.getMinute()); calendar.set(Calendar.SECOND, 0); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java index 52c592d30c..0ad58fb132 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -195,7 +194,7 @@ public class CastleDungeon extends AbstractInstance return "36403-02.html"; } - if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), CASTLE_DUNGEON.get(npc.getId()))) + if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), CASTLE_DUNGEON.get(npc.getId()))) { return "36403-03.html"; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java index b2051031fe..f380da8858 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java @@ -19,7 +19,6 @@ package instances.CavernOfThePirateCaptain; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; @@ -160,7 +159,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance { world.setParameter("is83", world.getTemplateId() == TEMPLATE_ID_83); world.setParameter("isNight", world.getTemplateId() == TEMPLATE_ID_60_NIGHT); - world.setParameter("storeTime", Chronos.currentTimeMillis()); + world.setParameter("storeTime", System.currentTimeMillis()); final List playersInside = new ArrayList<>(); if (!player.isInParty()) @@ -245,7 +244,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance } final Long reentertime = InstanceManager.getInstance().getInstanceTime(groupMembers.getObjectId(), (is83 ? TEMPLATE_ID_83 : isNight ? TEMPLATE_ID_60_NIGHT : TEMPLATE_ID_60)); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { broadcastSystemMessage(player, groupMembers, SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, true); return false; @@ -382,7 +381,7 @@ public class CavernOfThePirateCaptain extends AbstractInstance { if ((playersInside != null) && ((playersInside.getInstanceId() == world.getInstanceId()) && playersInside.isInsideRadius3D(npc, 1500))) { - final long time = Chronos.currentTimeMillis() - world.getParameters().getLong("storeTime", 0); + final long time = System.currentTimeMillis() - world.getParameters().getLong("storeTime", 0); if (time <= 300000) // 5 minutes { if (getRandomBoolean()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index e0c080f6f0..826edd7784 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -22,7 +22,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -153,7 +152,7 @@ public abstract class Chamber extends AbstractInstance { final long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); @@ -211,7 +210,7 @@ public abstract class Chamber extends AbstractInstance } // Teleport to raid room 10 min or lesser before instance end time for Tower and Square Chambers - else if (isBigChamber() && ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) < 600000)) + else if (isBigChamber() && ((inst.getInstanceEndTime() - System.currentTimeMillis()) < 600000)) { newRoom = ROOM_ENTER_POINTS.length - 1; } @@ -244,7 +243,7 @@ public abstract class Chamber extends AbstractInstance // Do not schedule room change for Square and Tower Chambers, if raid room is reached if (isBigChamber() && isBossRoom(world)) { - inst.setDuration((int) ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) + 1200000)); // Add 20 min to instance time if raid room is reached + inst.setDuration((int) ((inst.getInstanceEndTime() - System.currentTimeMillis()) + 1200000)); // Add 20 min to instance time if raid room is reached for (Npc npc : inst.getNpcs()) { @@ -501,7 +500,7 @@ public abstract class Chamber extends AbstractInstance if (isBigChamber()) { markRestriction(world); // Set reenter restriction - if ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) > 300000) + if ((inst.getInstanceEndTime() - System.currentTimeMillis()) > 300000) { inst.setDuration(300000); // Finish instance in 5 minutes } @@ -552,7 +551,7 @@ public abstract class Chamber extends AbstractInstance final long nextInterval = bossRoom ? 60000 : (ROOM_CHANGE_INTERVAL + getRandom(ROOM_CHANGE_RANDOM_TIME)) * 1000; // Schedule next room change only if remaining time is enough - if ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) > nextInterval) + if ((inst.getInstanceEndTime() - System.currentTimeMillis()) > nextInterval) { world.setParameter("roomChangeTask", ThreadPool.schedule(new ChangeRoomTask(world), nextInterval - 5000)); } @@ -589,7 +588,7 @@ public abstract class Chamber extends AbstractInstance public void run() { final Instance inst = InstanceManager.getInstance().getInstance(_world.getInstanceId()); - if ((inst == null) || ((inst.getInstanceEndTime() - Chronos.currentTimeMillis()) < 60000)) + if ((inst == null) || ((inst.getInstanceEndTime() - System.currentTimeMillis()) < 60000)) { final ScheduledFuture banishTask = _world.getParameters().getObject("banishTask", ScheduledFuture.class); if (banishTask != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 820b1a5695..c70fb5ac85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.ChatType; @@ -551,7 +550,7 @@ public class CrystalCaverns extends AbstractInstance party.broadcastPacket(sm); return false; } - if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID)) + if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID)) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); @@ -973,9 +972,9 @@ public class CrystalCaverns extends AbstractInstance if (tmpworld instanceof CCWorld) { final CCWorld world = (CCWorld) tmpworld; - if (((world._dragonClawStart + DRAGONCLAWTIME) <= Chronos.currentTimeMillis()) || (world._dragonClawNeed <= 0)) + if (((world._dragonClawStart + DRAGONCLAWTIME) <= System.currentTimeMillis()) || (world._dragonClawNeed <= 0)) { - world._dragonClawStart = Chronos.currentTimeMillis(); + world._dragonClawStart = System.currentTimeMillis(); world._dragonClawNeed = caster.getParty().getMemberCount() - 1; } else @@ -1004,9 +1003,9 @@ public class CrystalCaverns extends AbstractInstance { return super.onSkillSee(npc, caster, skill, targets, isSummon); } - else if (((world.dragonScaleStart + DRAGONSCALETIME) <= Chronos.currentTimeMillis()) || (world.dragonScaleNeed <= 0)) + else if (((world.dragonScaleStart + DRAGONSCALETIME) <= System.currentTimeMillis()) || (world.dragonScaleNeed <= 0)) { - world.dragonScaleStart = Chronos.currentTimeMillis(); + world.dragonScaleStart = System.currentTimeMillis(); world.dragonScaleNeed = ((party == null) && caster.isGM()) ? 0 : party != null ? (party.getMemberCount() - 1) : 100; } else @@ -1767,7 +1766,7 @@ public class CrystalCaverns extends AbstractInstance if (checkConditions(player)) { - final InstanceWorld instance = new CCWorld(Chronos.currentTimeMillis() + 5400000); + final InstanceWorld instance = new CCWorld(System.currentTimeMillis() + 5400000); instance.setInstance(InstanceManager.getInstance().createDynamicInstance(TEMPLATE_ID)); InstanceManager.getInstance().addWorld(instance); onEnterInstance(player, instance, true); @@ -1944,7 +1943,7 @@ public class CrystalCaverns extends AbstractInstance return null; } world.setStatus(30); - final long time = world.endTime - Chronos.currentTimeMillis(); + final long time = world.endTime - System.currentTimeMillis(); final Instance baylorInstance = InstanceManager.getInstance().getInstance(world.getInstanceId()); baylorInstance.setDuration((int) time); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index dd23eeef36..fb99a3ec5b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -30,7 +30,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; @@ -481,7 +480,7 @@ public class FinalEmperialTomb extends AbstractInstance implements IXmlReader return false; } final Long reentertime = InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID); - if (Chronos.currentTimeMillis() < reentertime) + if (System.currentTimeMillis() < reentertime) { party.broadcastPacket(new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addPcName(channelMember)); return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java index 3b273d46ea..467fc1416e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.World; @@ -141,11 +140,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(5015, 2); } - else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(5019, 1); } - else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + _rangedSkillMinCoolTime) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(5018, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case 5018: case 5019: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java index 90b3f6fc6d..b7f734c989 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.MountType; @@ -311,7 +310,7 @@ public class IceQueensCastleBattle extends AbstractInstance { startQuestTimer("STAGE_2_FAILED", 360000, controller, null); manageTimer(world, 360, NpcStringId.BATTLE_END_LIMIT_TIME); - controller.getVariables().set("TIMER_END", Chronos.currentTimeMillis() + 360000); + controller.getVariables().set("TIMER_END", System.currentTimeMillis() + 360000); } break; } @@ -705,7 +704,7 @@ public class IceQueensCastleBattle extends AbstractInstance } case "SHOW_GLAKIAS_TIMER": { - final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - Chronos.currentTimeMillis()) / 1000); + final int time = (int) ((controller.getVariables().getLong("TIMER_END", 0) - System.currentTimeMillis()) / 1000); manageTimer(world, time, NpcStringId.BATTLE_END_LIMIT_TIME); break; } @@ -1286,14 +1285,14 @@ public class IceQueensCastleBattle extends AbstractInstance party.broadcastPacket(sm); return false; } - else if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_EASY)) + else if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_EASY)) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(channelMember); party.broadcastPacket(sm); return false; } - else if (Chronos.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_HARD)) + else if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(channelMember.getObjectId(), TEMPLATE_ID_HARD)) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(channelMember); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index acdc279533..5f7158a02a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -25,7 +25,6 @@ import java.util.Map.Entry; import java.util.function.Function; import java.util.logging.Level; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.SkillFinishType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -492,7 +491,7 @@ public class Kamaloka extends AbstractInstance continue; } // if found instance still can't be reentered - exit - if (Chronos.currentTimeMillis() < entry.getValue()) + if (System.currentTimeMillis() < entry.getValue()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET); sm.addPcName(partyMember); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index 35e0162731..3a4adf92be 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -16,7 +16,6 @@ */ package quests.Q00307_ControlDeviceOfTheGiants; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -102,7 +101,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest { return "32711-09.html"; } - if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - Chronos.currentTimeMillis()) > 0) + if ((GlobalVariablesManager.getInstance().getLong("GiantsControlDeviceRespawn", 0) - System.currentTimeMillis()) > 0) { return "32711-09a.html"; } @@ -169,7 +168,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest qst.setCond(2, true); } } - GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(Chronos.currentTimeMillis() + RESPAWN_DELAY)); + GlobalVariablesManager.getInstance().set("GiantsControlDeviceRespawn", Long.toString(System.currentTimeMillis() + RESPAWN_DELAY)); } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java index fd299e2766..8669a051f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -103,13 +102,13 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest } GlobalVariablesManager.getInstance().set("VarangkaRespawn", respawnTime); - if ((respawnTime == 0) || ((respawnTime - Chronos.currentTimeMillis()) < 0)) + if ((respawnTime == 0) || ((respawnTime - System.currentTimeMillis()) < 0)) { startQuestTimer("altarSpawn", 5000, null, null); } else { - startQuestTimer("altarSpawn", respawnTime - Chronos.currentTimeMillis(), null, null); + startQuestTimer("altarSpawn", respawnTime - System.currentTimeMillis(), null, null); } } @@ -239,7 +238,7 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest _varangkaMinion1 = null; _varangkaMinion2 = null; final long respawn = Rnd.get(14400000, 28800000); - GlobalVariablesManager.getInstance().set("VarangkaRespawn", Chronos.currentTimeMillis() + respawn); + GlobalVariablesManager.getInstance().set("VarangkaRespawn", System.currentTimeMillis() + respawn); startQuestTimer("altarSpawn", respawn, null, null); takeItems(member, PROTECTION_SOULS_PENDANT, 1); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 8c363f0db2..80fd1e12b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.InstanceManager; @@ -241,7 +240,7 @@ public class Q00511_AwlUnderFoot extends Quest { return "FortressWarden-02b.htm"; } - else if (isEnter && (dungeon.getReEnterTime() > Chronos.currentTimeMillis())) + else if (isEnter && (dungeon.getReEnterTime() > System.currentTimeMillis())) { return "FortressWarden-07.htm"; } @@ -294,7 +293,7 @@ public class Q00511_AwlUnderFoot extends Quest final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); world.setInstance(instance); instance.setExitLoc(new Location(player)); - dungeon.setReEnterTime(Chronos.currentTimeMillis() + REENTERTIME); + dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME); InstanceManager.getInstance().addWorld(world); final int instanceId = world.getInstanceId(); LOGGER.info("Fortress AwlUnderFoot started " + dungeon.getInstanceId() + " Instance: " + instanceId + " created by player: " + player.getName()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java index 114ffd3a10..cc7b7626d7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java @@ -17,7 +17,6 @@ package quests.Q00610_MagicalPowerOfWaterPart2; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -55,7 +54,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest registerQuestItems(GREEN_TOTEM, ASHUTAR_HEART); final long test = GlobalVariablesManager.getInstance().getLong("Q00610_respawn", 0); - final long remain = test != 0 ? test - Chronos.currentTimeMillis() : 0; + final long remain = test != 0 ? test - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("spawn_npc", remain, null, null); @@ -159,7 +158,7 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest final int respawnMaxDelay = (int) (129600000 * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = getRandom(respawnMinDelay, respawnMaxDelay); cancelQuestTimer("despawn_ashutar", npc, null); - GlobalVariablesManager.getInstance().set("Q00610_respawn", String.valueOf(Chronos.currentTimeMillis() + respawnDelay)); + GlobalVariablesManager.getInstance().set("Q00610_respawn", String.valueOf(System.currentTimeMillis() + respawnDelay)); startQuestTimer("spawn_npc", respawnDelay, null, null); executeForEachPlayer(killer, npc, isSummon, true, false); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java index 2e589ab073..948f8e83cf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java @@ -17,7 +17,6 @@ package quests.Q00616_MagicalPowerOfFirePart2; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -55,7 +54,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest registerQuestItems(RED_TOTEM, NASTRON_HEART); final long test = GlobalVariablesManager.getInstance().getLong("Q00616_respawn", 0); - final long remain = test != 0 ? test - Chronos.currentTimeMillis() : 0; + final long remain = test != 0 ? test - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("spawn_npc", remain, null, null); @@ -159,7 +158,7 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest final int respawnMaxDelay = (int) (129600000 * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = getRandom(respawnMinDelay, respawnMaxDelay); cancelQuestTimer("despawn_nastron", npc, null); - GlobalVariablesManager.getInstance().set("Q00616_respawn", String.valueOf(Chronos.currentTimeMillis() + respawnDelay)); + GlobalVariablesManager.getInstance().set("Q00616_respawn", String.valueOf(System.currentTimeMillis() + respawnDelay)); startQuestTimer("spawn_npc", respawnDelay, null, null); executeForEachPlayer(killer, npc, isSummon, true, false); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index 330b3344ac..ff1b85a2bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; @@ -269,7 +268,7 @@ public class Q00726_LightWithinTheDarkness extends Quest final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); world.setInstance(instance); instance.setExitLoc(new Location(player)); - dungeon.setReEnterTime(Chronos.currentTimeMillis() + 14400000); + dungeon.setReEnterTime(System.currentTimeMillis() + 14400000); InstanceManager.getInstance().addWorld(world); ThreadPool.schedule(new spawnNpcs((PAWORLD) world), 10000); for (Player partyMember : party.getMembers()) @@ -343,7 +342,7 @@ public class Q00726_LightWithinTheDarkness extends Quest { return "FortWarden-08.htm"; } - else if (isEnter && (dungeon.getReEnterTime() > Chronos.currentTimeMillis())) + else if (isEnter && (dungeon.getReEnterTime() > System.currentTimeMillis())) { return "FortWarden-09.htm"; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 15faa1824b..a018d01512 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -583,7 +582,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest } } - if (dungeon.getReEnterTime() > Chronos.currentTimeMillis()) + if (dungeon.getReEnterTime() > System.currentTimeMillis()) { return "CastleWarden-18.html"; } @@ -618,7 +617,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest world.setInstance(instance); instance.setExitLoc(new Location(player)); final int instanceId = world.getInstanceId(); - dungeon.setReEnterTime(Chronos.currentTimeMillis() + REENTER_INTERVAL); + dungeon.setReEnterTime(System.currentTimeMillis() + REENTER_INTERVAL); InstanceManager.getInstance().addWorld(world); ThreadPool.schedule(new spawnNpcs((CAUWorld) world), INITIAL_SPAWN_DELAY); if (DEBUG) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java index 00609665d8..f8b43b0748 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -179,7 +178,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -466,7 +465,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java index 48d1429fef..1f7f9b97fe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -562,19 +561,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java index 14e6b64774..9b170ca441 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -126,7 +125,7 @@ public class BotReportTable c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -293,7 +292,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.FIVE_YEARS_HAVE_PASSED_SINCE_THIS_CHARACTER_S_CREATION); @@ -304,7 +303,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { @@ -424,12 +423,12 @@ public class BotReportTable c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -471,7 +470,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ee4ed00bab..c1ffa55802 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.instancemanager.CHSiegeManager; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; @@ -173,7 +172,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -362,7 +361,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c729b91a54..edf26864d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 3cb4320ebf..cb3f8ffd78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -274,7 +273,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, _nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(this::changeMode, _nextModeChange.getTimeInMillis() - System.currentTimeMillis()); } public void changeMode() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index af003d2713..8d59bf2e85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -36,7 +36,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; @@ -338,7 +337,7 @@ public class CursedWeaponsManager final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java index 617f812092..4627c2bfc7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FishingChampionshipManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; @@ -73,14 +72,14 @@ public class FishingChampionshipManager refreshWinResult(); recalculateMinLength(); - if (_enddate <= Chronos.currentTimeMillis()) + if (_enddate <= System.currentTimeMillis()) { - _enddate = Chronos.currentTimeMillis(); + _enddate = System.currentTimeMillis(); new finishChamp().run(); } else { - ThreadPool.schedule(new finishChamp(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new finishChamp(), _enddate - System.currentTimeMillis()); } } @@ -207,7 +206,7 @@ public class FishingChampionshipManager public long getTimeRemaining() { - return (_enddate - Chronos.currentTimeMillis()) / 60000; + return (_enddate - System.currentTimeMillis()) / 60000; } public String getWinnerName(int par) @@ -472,7 +471,7 @@ public class FishingChampionshipManager shutdown(); LOGGER.info("FishingChampionshipManager : new event period start."); - ThreadPool.schedule(new finishChamp(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new finishChamp(), _enddate - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 97bcd52939..b2c861f279 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -101,7 +100,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -176,7 +175,7 @@ public class IdManager statement.executeUpdate("UPDATE clanhall SET ownerId=0, paidUntil=0, paid=0 WHERE clanhall.ownerId NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -192,7 +191,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7aa9bed36b..c5cf01971f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; @@ -176,7 +175,7 @@ public class InstanceManager implements IXmlReader { final int id = rs.getInt("instanceId"); final long time = rs.getLong("time"); - if (time < Chronos.currentTimeMillis()) + if (time < System.currentTimeMillis()) { deleteInstanceTime(playerObjId, id); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 354fac1235..c5c24adbd7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index efcac8ca63..9ea9a9e821 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -70,7 +69,7 @@ public class PunishmentManager final long expirationTime = rset.getLong("expiration"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoDManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoDManager.java index 43a36892e3..6af6a5d276 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoDManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoDManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -106,7 +105,7 @@ public class SoDManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -174,7 +173,7 @@ public class SoDManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -200,7 +199,7 @@ public class SoDManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoIManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoIManager.java index 5f8258eae3..10b49e7cbb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoIManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SoIManager.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.model.Location; @@ -76,7 +75,7 @@ public class SoIManager { return 0; } - return (GlobalVariablesManager.getInstance().getLong("SoI_opened", 0) * 1000) - Chronos.currentTimeMillis(); + return (GlobalVariablesManager.getInstance().getLong("SoI_opened", 0) * 1000) - System.currentTimeMillis(); } public static void setCurrentStage(int stage) @@ -112,7 +111,7 @@ public class SoIManager { return; } - GlobalVariablesManager.getInstance().set("SoI_opened", (Chronos.currentTimeMillis() + time) / 1000); + GlobalVariablesManager.getInstance().set("SoI_opened", (System.currentTimeMillis() + time) / 1000); LOGGER.info("Seed of Infinity Manager: Opening the seed for " + Util.formatTime((int) time / 1000)); spawnOpenedSeed(); DoorData.getInstance().getDoor(14240102).openMe(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java index b3e6532c80..c0def2e7ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -1114,7 +1113,7 @@ public class TerritoryWarManager implements Siegable { final Calendar cal = Calendar.getInstance(); final long nextSiegeDate = GlobalVariablesManager.getInstance().getLong(GLOBAL_VARIABLE, 0); - if (nextSiegeDate > Chronos.currentTimeMillis()) + if (nextSiegeDate > System.currentTimeMillis()) { cal.setTimeInMillis(nextSiegeDate); } @@ -1123,7 +1122,7 @@ public class TerritoryWarManager implements Siegable // Let's check if territory war date was in the past. if (cal.before(Calendar.getInstance())) { - cal.setTimeInMillis(Chronos.currentTimeMillis()); + cal.setTimeInMillis(System.currentTimeMillis()); } final boolean hasOwnedCastle = CastleManager.getInstance().hasOwnedCastle(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 46d39bc132..31954fb98f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -422,7 +421,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -519,7 +518,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - _holder.broadCastPacketToTeam(new ExCubeGameChangePoints((int) ((_startedTime - Chronos.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints())); + _holder.broadCastPacketToTeam(new ExCubeGameChangePoints((int) ((_startedTime - System.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints())); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index a579be6a5f..d31dc42ef1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -61,7 +60,7 @@ public class Lottery _prize = Config.ALT_LOTTERY_PRIZE; _isSellingTickets = false; _isStarted = false; - _enddate = Chronos.currentTimeMillis(); + _enddate = System.currentTimeMillis(); if (Config.ALLOW_LOTTERY) { (new startLottery()).run(); @@ -141,20 +140,20 @@ public class Lottery { _prize = rset.getLong("prize"); _enddate = rset.getLong("enddate"); - if (_enddate <= (Chronos.currentTimeMillis() + (2 * MINUTE))) + if (_enddate <= (System.currentTimeMillis() + (2 * MINUTE))) { (new finishLottery()).run(); return; } - if (_enddate > Chronos.currentTimeMillis()) + if (_enddate > System.currentTimeMillis()) { _isStarted = true; - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); - if (_enddate > (Chronos.currentTimeMillis() + (12 * MINUTE))) + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); + if (_enddate > (System.currentTimeMillis() + (12 * MINUTE))) { _isSellingTickets = true; - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); } return; } @@ -186,8 +185,8 @@ public class Lottery _enddate = finishtime.getTimeInMillis(); } - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java index fe93546591..a0e7ad0d87 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.TransformData; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -333,7 +332,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -351,7 +350,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -635,7 +634,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Message.java index d2c1e2b512..c0f2c3cdd3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Message.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MessageSenderType; @@ -94,7 +93,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -112,7 +111,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -132,7 +131,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Nevit.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Nevit.java index 8fbd5ed2d3..ae32c5be65 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Nevit.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Nevit.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; @@ -67,7 +66,7 @@ public class Nevit implements IUniqueId cal.set(Calendar.MILLISECOND, 0); // Reset Nevit's Blessing - if ((_player.getLastAccess() < (cal.getTimeInMillis() / 1000)) && (Chronos.currentTimeMillis() > cal.getTimeInMillis())) + if ((_player.getLastAccess() < (cal.getTimeInMillis() / 1000)) && (System.currentTimeMillis() > cal.getTimeInMillis())) { _player.getVariables().set("hunting_time", 0); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Petition.java index 5e53c55f12..27da343340 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java index 5d790b9ae6..b215ed8d9c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Spawn.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.NpcPersonalAIData; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -254,7 +253,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TimeStamp.java index 0523aab268..72f604df3a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -50,7 +49,7 @@ public class TimeStamp _id1 = skill.getId(); _id2 = skill.getLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -65,7 +64,7 @@ public class TimeStamp _id1 = item.getId(); _id2 = item.getObjectId(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -143,7 +142,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -161,7 +160,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java index 0d264dd578..47dd91df61 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.enums.ShotType; @@ -739,7 +738,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif */ private final void sendInstanceUpdate(Instance instance, boolean hide) { - final int startTime = (int) ((Chronos.currentTimeMillis() - instance.getInstanceStartTime()) / 1000); + final int startTime = (int) ((System.currentTimeMillis() - instance.getInstanceStartTime()) / 1000); final int endTime = (int) ((instance.getInstanceEndTime() - instance.getInstanceStartTime()) / 1000); if (instance.isTimerIncrease()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5ddd4c106c..dd35f37ad8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; @@ -244,7 +243,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -253,7 +252,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4083cb8ac2..73bc66b5db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -37,7 +37,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; @@ -2223,7 +2222,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -2353,7 +2352,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -2396,7 +2395,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java index db33de1314..372b719aa6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -251,7 +250,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java index 3633ea9c61..e55f14157d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -46,7 +46,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -2824,7 +2823,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3879,22 +3878,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5506,7 +5505,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5539,11 +5538,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6492,7 +6491,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6711,7 +6710,7 @@ public class Player extends Playable PreparedStatement ps = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { ps.setInt(1, isOnlineInt()); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, getObjectId()); ps.execute(); } @@ -6836,12 +6835,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6858,7 +6857,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7370,7 +7369,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } ps.setLong(35, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); ps.setInt(36, _newbie); @@ -7455,7 +7454,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7555,7 +7554,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7845,7 +7844,7 @@ public class Player extends Playable ps.setInt(2, _classIndex); try (ResultSet rs = ps.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rs.next()) { final int remainingTime = rs.getInt("remaining_time"); @@ -7907,7 +7906,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rs.next()) { itemId = rs.getInt("itemId"); @@ -13416,7 +13415,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -13468,7 +13467,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } public MovieHolder getMovieHolder() @@ -13486,7 +13485,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -13495,7 +13494,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -14029,7 +14028,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java index 65139f17e0..476be79aa7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Auctioneer.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; @@ -172,7 +171,7 @@ public class Auctioneer extends Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -404,7 +403,7 @@ public class Auctioneer extends Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -435,7 +434,7 @@ public class Auctioneer extends Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); - html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - Chronos.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - Chronos.currentTimeMillis()) / 60000) % 60) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallTable.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 496007bc0f..f5a103ce4f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -147,7 +146,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index c1e389cfb6..ee1d81f5af 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1061,13 +1060,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index b5351a1201..6b22cbb09d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java index ff56bde49f..52b51cc499 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.tasks.player; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class LookingForFishTask implements Runnable { _player = player; _fishGutsCheck = fishGutsCheck; - _endTaskTime = Chronos.currentTimeMillis() + (startCombatTime * 1000) + 10000; + _endTaskTime = System.currentTimeMillis() + (startCombatTime * 1000) + 10000; _fishGroup = fishGroup; _isNoob = isNoob; _isUpperGrade = isUpperGrade; @@ -48,7 +47,7 @@ public class LookingForFishTask implements Runnable { if (_player != null) { - if (Chronos.currentTimeMillis() >= _endTaskTime) + if (System.currentTimeMillis() >= _endTaskTime) { _player.endFishing(false); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/buylist/Product.java index 32ca2a801c..ab0a5108cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -110,7 +109,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -124,7 +123,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java index b69975176f..af525cfd85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -488,7 +487,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_CREATE_DAYS)); + player.setClanCreateExpiryTime(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_CREATE_DAYS)); } // remove Clan skills from Player removeSkillEffects(player); @@ -526,7 +525,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember.getObjectId(), clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_CREATE_DAYS) : 0); + removeMemberInDatabase(exMember.getObjectId(), clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_CREATE_DAYS) : 0); } // Notify to scripts @@ -1067,12 +1066,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2195,7 +2194,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2207,7 +2206,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2256,7 +2255,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2292,7 +2291,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2386,12 +2385,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2444,7 +2443,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2470,7 +2469,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index d4f1f0bc02..a8f16bc9b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -36,7 +36,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -101,7 +100,7 @@ public class Instance public Instance(int id) { _id = id; - _instanceStartTime = Chronos.currentTimeMillis(); + _instanceStartTime = System.currentTimeMillis(); } /** @@ -184,7 +183,7 @@ public class Instance } _checkTimeUpTask = ThreadPool.schedule(new CheckTimeUp(duration), 500); - _instanceEndTime = Chronos.currentTimeMillis() + duration + 500; + _instanceEndTime = System.currentTimeMillis() + duration + 500; } /** @@ -226,8 +225,8 @@ public class Instance { return; } - _lastLeft = Chronos.currentTimeMillis(); - setDuration((int) (_instanceEndTime - Chronos.currentTimeMillis() - 500)); + _lastLeft = System.currentTimeMillis(); + setDuration((int) (_instanceEndTime - System.currentTimeMillis() - 500)); } public void addNpc(Npc npc) @@ -510,7 +509,7 @@ public class Instance if (a != null) { _checkTimeUpTask = ThreadPool.schedule(new CheckTimeUp(Integer.parseInt(a.getNodeValue()) * 60000), 15000); - _instanceEndTime = Chronos.currentTimeMillis() + (Long.parseLong(a.getNodeValue()) * 60000) + 15000; + _instanceEndTime = System.currentTimeMillis() + (Long.parseLong(a.getNodeValue()) * 60000) + 15000; } break; } @@ -774,7 +773,7 @@ public class Instance } else if (_players.isEmpty() && (_emptyDestroyTime > 0)) { - final Long emptyTimeLeft = (_lastLeft + _emptyDestroyTime) - Chronos.currentTimeMillis(); + final Long emptyTimeLeft = (_lastLeft + _emptyDestroyTime) - System.currentTimeMillis(); if (emptyTimeLeft <= 0) { interval = 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 079a701254..20f73dcda6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; import org.l2jmobius.gameserver.data.xml.OptionData; @@ -187,7 +186,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); _enchantLevel = 0; scheduleLifeTimeTask(); } @@ -211,7 +210,7 @@ public class Item extends WorldObject setCount(1); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); } @@ -1539,7 +1538,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1762,7 +1761,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index bb4ba566b2..c9e6cff8c5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -183,12 +182,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -341,7 +340,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -428,7 +427,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index bd9c9c5b5d..20836f22d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -243,7 +242,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -252,10 +251,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -266,13 +265,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -287,7 +286,7 @@ public class ItemAuctionInstance Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { @@ -309,7 +308,7 @@ public class ItemAuctionInstance if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -324,17 +323,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -417,7 +416,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -427,7 +426,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -437,7 +436,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -447,7 +446,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -571,7 +570,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index dd2c153eae..0dc6665d62 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -84,7 +83,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 0254c6ce3d..cbdf02adf6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -765,7 +764,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -786,7 +785,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -800,7 +799,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 282e4cb5b7..7eb4ff42b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -517,7 +516,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = Chronos.currentTimeMillis() - _startTime; + final long _fightTime = System.currentTimeMillis() - _startTime; double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 93136cc9e2..69911bba4a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -131,7 +130,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -147,7 +146,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, _expirationTime - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this, _expirationTime - System.currentTimeMillis()); } } @@ -225,7 +224,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(UPDATE_QUERY)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setLong(2, _id); ps.execute(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index bba81ea0be..3cb0afc993 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -38,7 +38,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -321,7 +320,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestState.java index ddbd42075d..7836da0bd3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; @@ -753,7 +752,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/AuctionableHall.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/AuctionableHall.java index 09922a45a2..384f1122cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/AuctionableHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/AuctionableHall.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; @@ -98,7 +97,7 @@ public class AuctionableHall extends ClanHall public void setOwner(Clan clan) { super.setOwner(clan); - _paidUntil = Chronos.currentTimeMillis(); + _paidUntil = System.currentTimeMillis(); initialyzeTask(true); } @@ -108,20 +107,20 @@ public class AuctionableHall extends ClanHall */ private final void initialyzeTask(boolean forced) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_paidUntil > currentTime) { ThreadPool.schedule(new FeeTask(), _paidUntil - currentTime); } else if (!_paid && !forced) { - if ((Chronos.currentTimeMillis() + (3600000 * 24)) <= (_paidUntil + CH_RATE)) + if ((System.currentTimeMillis() + (3600000 * 24)) <= (_paidUntil + CH_RATE)) { - ThreadPool.schedule(new FeeTask(), Chronos.currentTimeMillis() + (3600000 * 24)); + ThreadPool.schedule(new FeeTask(), System.currentTimeMillis() + (3600000 * 24)); } else { - ThreadPool.schedule(new FeeTask(), (_paidUntil + CH_RATE) - Chronos.currentTimeMillis()); + ThreadPool.schedule(new FeeTask(), (_paidUntil + CH_RATE) - System.currentTimeMillis()); } } else @@ -140,7 +139,7 @@ public class AuctionableHall extends ClanHall { try { - final long _time = Chronos.currentTimeMillis(); + final long _time = System.currentTimeMillis(); if (isFree()) { return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index a666e5ae71..fbe941c379 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; @@ -130,7 +129,7 @@ public abstract class ClanHall { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -160,7 +159,7 @@ public abstract class ClanHall if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index 0c5370dbb0..f4639c57a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.AuctionItemType; @@ -146,7 +145,7 @@ public class ClanHallAuction public ClanHallAuction(int itemId, Clan clan, long delay, long bid, String name) { _id = itemId; - _endDate = Chronos.currentTimeMillis() + delay; + _endDate = System.currentTimeMillis() + delay; _itemId = itemId; _itemName = name; _itemType = "ClanHall"; @@ -221,7 +220,7 @@ public class ClanHallAuction /** Task Manage */ private void startAutoTask() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long taskDelay = 0; if (_endDate <= currentTime) { @@ -343,7 +342,7 @@ public class ClanHallAuction ps.setInt(1, bidder.getClanId()); ps.setString(2, bidder.getClan().getLeaderName()); ps.setLong(3, bid); - ps.setLong(4, Chronos.currentTimeMillis()); + ps.setLong(4, System.currentTimeMillis()); ps.setInt(5, _id); ps.setInt(6, bidder.getClanId()); ps.execute(); @@ -359,7 +358,7 @@ public class ClanHallAuction ps.setString(4, bidder.getName()); ps.setLong(5, bid); ps.setString(6, bidder.getClan().getName()); - ps.setLong(7, Chronos.currentTimeMillis()); + ps.setLong(7, System.currentTimeMillis()); ps.execute(); } if (World.getInstance().getPlayer(_highestBidderName) != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java index a5bc5a8fed..44824a0bf4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSigns.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.AutoSpawnHandler; @@ -498,7 +497,7 @@ public class SevenSigns public long getMilliToPeriodChange() { - return (_nextPeriodChange.getTimeInMillis() - Chronos.currentTimeMillis()); + return (_nextPeriodChange.getTimeInMillis() - System.currentTimeMillis()); } protected void setCalendarForNextPeriodChange() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java index 0cc7b1b13d..f676c2ba4d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.SpawnTable; @@ -1230,12 +1229,12 @@ public class SevenSignsFestival implements SpawnListener public void setNextCycleStart() { - _nextFestivalCycleStart = Chronos.currentTimeMillis() + Config.ALT_FESTIVAL_CYCLE_LENGTH; + _nextFestivalCycleStart = System.currentTimeMillis() + Config.ALT_FESTIVAL_CYCLE_LENGTH; } public void setNextFestivalStart(long milliFromNow) { - _nextFestivalStart = Chronos.currentTimeMillis() + milliFromNow; + _nextFestivalStart = System.currentTimeMillis() + milliFromNow; } public long getMinsToNextCycle() @@ -1244,7 +1243,7 @@ public class SevenSignsFestival implements SpawnListener { return -1; } - return (_nextFestivalCycleStart - Chronos.currentTimeMillis()) / 60000; + return (_nextFestivalCycleStart - System.currentTimeMillis()) / 60000; } public int getMinsToNextFestival() @@ -1253,7 +1252,7 @@ public class SevenSignsFestival implements SpawnListener { return -1; } - return (int) (((_nextFestivalStart - Chronos.currentTimeMillis()) / 60000) + 1); + return (int) (((_nextFestivalStart - System.currentTimeMillis()) / 60000) + 1); } public String getTimeToNextFestivalStr() @@ -1554,7 +1553,7 @@ public class SevenSignsFestival implements SpawnListener } // Update the highest scores and party list. - currFestData.set("date", String.valueOf(Chronos.currentTimeMillis())); + currFestData.set("date", String.valueOf(System.currentTimeMillis())); currFestData.set("score", offeringScore); currFestData.set("members", Util.implodeString(partyMembers, ",")); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Castle.java index cc4d62eb7a..d2f4eb564c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SkillData; @@ -160,7 +159,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -195,7 +194,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java index 86c0e5f74a..7dd09b812b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -163,7 +162,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -193,7 +192,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -580,7 +579,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -786,7 +785,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -912,12 +911,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/FortSiege.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/FortSiege.java index b7e28de80f..1a7391fc1d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/FortSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/FortSiege.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.FortTeleportWhoType; @@ -714,12 +713,12 @@ public class FortSiege implements Siegable return 1; // Player dont havee enough adena to register } - else if ((Chronos.currentTimeMillis() < TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isRegistrationOver()) + else if ((System.currentTimeMillis() < TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isRegistrationOver()) { return 2; // Is not right time to register Fortress now } - if ((Chronos.currentTimeMillis() > TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isTWChannelOpen()) + if ((System.currentTimeMillis() > TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isTWChannelOpen()) { return 2; // Is not right time to register Fortress now } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Siege.java index b55eb41033..12bc464ac2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; import org.l2jmobius.gameserver.enums.PlayerCondOverride; @@ -1414,9 +1413,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/clanhalls/ClanHallSiegeEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/clanhalls/ClanHallSiegeEngine.java index 48f3ebbe6c..e28b4d0609 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/clanhalls/ClanHallSiegeEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/clanhalls/ClanHallSiegeEngine.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.SiegeClanType; @@ -87,7 +86,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable _hall = CHSiegeManager.getInstance().getSiegableHall(hallId); _hall.setSiege(this); - _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - Chronos.currentTimeMillis() - 3600000); + _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000); LOGGER.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime() + "."); loadAttackers(); } @@ -402,7 +401,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable onSiegeEnds(); - _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - Chronos.currentTimeMillis() - 3600000); + _siegeTask = ThreadPool.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000); LOGGER.config("Siege of " + _hall.getName() + " scheduled for " + _hall.getSiegeDate().getTime() + "."); _hall.updateSiegeStatus(SiegeStatus.REGISTERING); unSpawnSiegeGuards(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/clanhalls/SiegableHall.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/clanhalls/SiegableHall.java index 872394626c..5d3d4c9428 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/clanhalls/SiegableHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/clanhalls/SiegableHall.java @@ -22,7 +22,6 @@ import java.util.Calendar; import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.SiegeClanType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; @@ -83,7 +82,7 @@ public class SiegableHall extends ClanHall _nextSiege = Calendar.getInstance(); final long nextSiege = set.getLong("nextSiege"); - if ((nextSiege - Chronos.currentTimeMillis()) < 0) + if ((nextSiege - System.currentTimeMillis()) < 0) { updateNextSiege(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java index a4372fbc80..ca05265b71 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java @@ -21,7 +21,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.enums.TeleportWhereType; @@ -166,7 +165,7 @@ public class BossZone extends ZoneType // with legal entries, do nothing. if (expirationTime == null) // legal null expirationTime entries { - if (GameServer.dateTimeServerStarted.getTimeInMillis() > (Chronos.currentTimeMillis() - _timeInvade)) + if (GameServer.dateTimeServerStarted.getTimeInMillis() > (System.currentTimeMillis() - _timeInvade)) { return; } @@ -175,7 +174,7 @@ public class BossZone extends ZoneType { // legal non-null logoutTime entries getSettings().getPlayerAllowedReEntryTimes().remove(player.getObjectId()); - if (expirationTime.longValue() > Chronos.currentTimeMillis()) + if (expirationTime.longValue() > System.currentTimeMillis()) { return; } @@ -238,7 +237,7 @@ public class BossZone extends ZoneType if (!player.isOnline() && getSettings().getPlayersAllowed().contains(player.getObjectId())) { // mark the time that the player left the zone - getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), Chronos.currentTimeMillis() + _timeInvade); + getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), System.currentTimeMillis() + _timeInvade); } else { @@ -405,7 +404,7 @@ public class BossZone extends ZoneType { getSettings().getPlayersAllowed().add(player.getObjectId()); } - getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), Chronos.currentTimeMillis() + (durationInSec * 1000)); + getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), System.currentTimeMillis() + (durationInSec * 1000)); } public void removePlayer(Player player) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java index 2a43d2eb09..c526b1c243 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -321,7 +320,7 @@ public class GameClient extends ChannelInboundHandler { try (PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 76490ee804..192c962173 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -81,7 +80,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index a3ac6e3815..1a6ee7dd57 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -62,7 +61,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index f1b2ecd4b9..37b01ded5b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -373,7 +372,7 @@ public class EnterWorld implements IClientIncomingPacket if (Config.ENABLE_VITALITY && Config.RECOVER_VITALITY_ON_RECONNECT) { - final float points = (Config.RATE_RECOVERY_ON_RECONNECT * (Chronos.currentTimeMillis() - player.getLastAccess())) / 60000; + final float points = (Config.RATE_RECOVERY_ON_RECONNECT * (System.currentTimeMillis() - player.getLastAccess())) / 60000; if (points > 0) { player.updateVitalityPoints(points, false, true); @@ -549,7 +548,7 @@ public class EnterWorld implements IClientIncomingPacket DimensionalRiftManager.getInstance().teleportToWaitingRoom(player); } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 53e3530035..6f4f799e45 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.nio.BufferUnderflowException; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.model.Location; @@ -77,7 +76,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 35121d5eda..6750f14457 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -118,7 +117,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((player.getActiveEnchantTimestamp() == 0) || ((Chronos.currentTimeMillis() - player.getActiveEnchantTimestamp()) < 2000)) + if ((player.getActiveEnchantTimestamp() == 0) || ((System.currentTimeMillis() - player.getActiveEnchantTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.setActiveEnchantItemId(Player.ID_NONE); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 900f320aee..63fc7d9576 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 95e26fa980..44f3a72f4f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; @@ -75,7 +74,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } player.setEnchanting(true); - player.setActiveEnchantTimestamp(Chronos.currentTimeMillis()); + player.setActiveEnchantTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java index 1e1c8cfdf6..a920d9cc32 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinDominionWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -81,7 +80,7 @@ public class RequestJoinDominionWar implements IClientIncomingPacket if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index 60546bb867..bf06a31ef2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CHSiegeManager; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -74,7 +73,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; @@ -100,7 +99,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index aaf2cb1de3..28ba1388ca 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 2b9edcb0ea..dc68a12536 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -20,7 +20,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -83,8 +82,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index af09102efa..af3af505f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -69,7 +68,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index af104f3a4e..b880bd4aa4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index aab2e59c53..bdce4a5e28 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -20,7 +20,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -64,7 +63,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + TimeUnit.DAYS.toMillis(Config.ALT_CLAN_JOIN_DAYS)); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index d3b734922b..3837d20056 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -136,7 +135,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(Math.min(charInfoPackage.getEnchantEffect(), 127)); @@ -216,7 +215,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index d2cb23b2bc..5922e9376c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index df253d3e90..31057e9afe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index c78f0085db..ac49b97063 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.instancemanager.CHSiegeManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -96,7 +95,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c974b33ae..b9877d2c78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -36,7 +35,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if (_currentTime < ts.getStamp()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index cbbceb067e..bdc222ff1e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Cubic; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -111,7 +110,7 @@ public class AttackStanceTaskManager implements Runnable } } } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 90455cd4eb..c9d4a889f2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager; import org.l2jmobius.gameserver.model.actor.Creature; @@ -87,7 +86,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -145,7 +144,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -156,7 +155,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index d7d41a53d0..0717347630 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 17eaae45c7..e7fd00f894 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskClanLeaderApply; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; @@ -102,7 +101,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -257,7 +256,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -308,7 +307,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 8627f6b73b..b48719953c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index e1d699cf5a..599bc6bbee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -139,7 +138,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java index 90ca7077ee..2ff46a5410 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/ServerList.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.network.IOutgoingPacket; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.loginserver.GameServerTable; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; import org.l2jmobius.loginserver.network.LoginClient; @@ -167,7 +166,7 @@ public class ServerList implements IOutgoingPacket packet.writeC(_charsToDelete.get(servId).length); for (long deleteTime : _charsToDelete.get(servId)) { - packet.writeD((int) ((deleteTime - Chronos.currentTimeMillis()) / 1000)); + packet.writeD((int) ((deleteTime - System.currentTimeMillis()) / 1000)); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 627cc875eb..0b685d633b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 4b9d5fcbb1..59ed424561 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -54,7 +53,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -62,7 +61,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java index 8f3e31646e..9c85778f93 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java @@ -19,7 +19,6 @@ package handlers.usercommandhandlers; import java.util.Map; import java.util.Map.Entry; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -66,7 +65,7 @@ public class InstanceZone implements IUserCommandHandler { for (Entry entry : instanceTimes.entrySet()) { - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 60) { if (firstMessage) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index 38985c1d43..7dcfa2ac86 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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 +102,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java index c00a7ed14e..c4cf79fccb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -182,7 +181,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -464,7 +463,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java index ec667fd92d..5d63ef9388 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java index 3a3da49de4..e8c502a87c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ff17f694f3..ed889ce365 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index 7098b58418..2ef20a2148 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -102,7 +101,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); storePlayerEntry(entry); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index aa27cbc5e1..92152dec86 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -74,7 +73,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -107,7 +106,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 7659ca0248..af7aa3d726 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 73761d60e8..bcdb7aba98 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -217,7 +216,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -226,7 +225,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8adb556efe..8a09e693b6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java index ff04ec651e..ef691d5d8d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java index d765afd641..606adbae76 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -49,7 +49,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -2842,7 +2841,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3923,22 +3922,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5282,7 +5281,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5315,11 +5314,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6195,7 +6194,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6440,7 +6439,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6565,12 +6564,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6629,7 +6628,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7132,7 +7131,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7217,7 +7216,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7332,7 +7331,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7622,7 +7621,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7684,7 +7683,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7759,7 +7758,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7882,7 +7881,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -7956,8 +7955,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + i, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + i, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -12314,7 +12313,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12555,7 +12554,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12607,7 +12606,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12628,7 +12627,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12637,7 +12636,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -12996,7 +12995,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -13900,7 +13899,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index a49d1e71ff..646754eab3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java index 1cb6626fdc..ad3f498422 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2197,7 +2196,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2209,7 +2208,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2258,7 +2257,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2294,7 +2293,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2388,12 +2387,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2445,7 +2444,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2471,7 +2470,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index abd2b2d94b..cd39cde48c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 5bbc422ad3..469bb55c42 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -199,7 +198,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -222,7 +221,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1521,7 +1520,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1800,7 +1799,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2454,7 +2453,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 77a0e89162..567c99b70f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 20b222a2a2..fb239220d0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 92e8dc4386..82e707b307 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e2945568aa..e63fbfb564 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Castle.java index 4e90413baf..e5924cd118 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java index 911f5868fc..5ddd6e9447 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 377a0763bf..ac538aef99 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -526,7 +525,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index ca97e513e5..245d953a0c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 4ac3a80bc1..9963bcec93 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 2deae58393..dcbe87502c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index c82873c2f2..01a48d82d8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -260,7 +259,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 6e880a17fa..51140d34fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -164,7 +163,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index ea750c697c..bae53f4051 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -165,7 +164,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -253,7 +252,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index b81b25c3d7..d81f6868b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -50,7 +49,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 627cc875eb..0b685d633b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index e47cfb5f35..9ddee40d1e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -54,7 +53,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -98,7 +97,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 8039543b27..ec3d041ce4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java index c00a7ed14e..c4cf79fccb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -182,7 +181,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -464,7 +463,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java index ec667fd92d..5d63ef9388 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java index 3a3da49de4..e8c502a87c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ff17f694f3..ed889ce365 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index aa27cbc5e1..92152dec86 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -74,7 +73,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -107,7 +106,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 7659ca0248..af7aa3d726 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 73761d60e8..bcdb7aba98 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -217,7 +216,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -226,7 +225,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8adb556efe..8a09e693b6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java index ff04ec651e..ef691d5d8d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java index 5da6788e4e..e7feba126f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -49,7 +49,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -2842,7 +2841,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3923,22 +3922,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5282,7 +5281,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5315,11 +5314,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6195,7 +6194,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6440,7 +6439,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6565,12 +6564,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6629,7 +6628,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7132,7 +7131,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7217,7 +7216,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7332,7 +7331,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7622,7 +7621,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7684,7 +7683,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7759,7 +7758,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7882,7 +7881,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -7956,8 +7955,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + i, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + i, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -12314,7 +12313,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12555,7 +12554,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12607,7 +12606,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12628,7 +12627,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12637,7 +12636,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -12996,7 +12995,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -13900,7 +13899,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index a49d1e71ff..646754eab3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java index 1cb6626fdc..ad3f498422 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2197,7 +2196,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2209,7 +2208,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2258,7 +2257,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2294,7 +2293,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2388,12 +2387,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2445,7 +2444,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2471,7 +2470,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index abd2b2d94b..cd39cde48c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 5bbc422ad3..469bb55c42 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -199,7 +198,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -222,7 +221,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1521,7 +1520,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1800,7 +1799,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2454,7 +2453,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 20b222a2a2..fb239220d0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 92e8dc4386..82e707b307 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e2945568aa..e63fbfb564 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Castle.java index 4e90413baf..e5924cd118 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java index 911f5868fc..5ddd6e9447 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6557986418..20cfecaf02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -526,7 +525,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index ca97e513e5..245d953a0c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 4ac3a80bc1..9963bcec93 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 2deae58393..dcbe87502c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index c82873c2f2..01a48d82d8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -260,7 +259,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 6e880a17fa..51140d34fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -164,7 +163,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 84daad43be..712cd88b49 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -165,7 +164,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -253,7 +252,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index f11ae5f478..5dac295e4f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 627cc875eb..0b685d633b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index e47cfb5f35..9ddee40d1e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -54,7 +53,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -98,7 +97,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 8039543b27..ec3d041ce4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Classic_2.1_Zaken/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java index e476314220..11b19998d0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -183,7 +182,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -466,7 +465,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java index ec667fd92d..5d63ef9388 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java index 3a3da49de4..e8c502a87c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ff17f694f3..ed889ce365 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 1ec27ca276..a233b15a38 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -74,7 +73,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -107,7 +106,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 1ce86b6c3b..5964444fa3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2ade9a1fe6..10fd28f92c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -217,7 +216,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -226,7 +225,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index fb46d959b5..dd28cba970 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java index ff04ec651e..ef691d5d8d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -206,7 +205,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java index 1fcfcff0b9..def2e7288f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -49,7 +49,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -2840,7 +2839,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3907,22 +3906,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5267,7 +5266,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5300,11 +5299,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6181,7 +6180,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6426,7 +6425,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6551,12 +6550,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6615,7 +6614,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7118,7 +7117,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7203,7 +7202,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7318,7 +7317,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7608,7 +7607,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7670,7 +7669,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7745,7 +7744,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7868,7 +7867,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -7942,8 +7941,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + i, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + i, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -12300,7 +12299,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12541,7 +12540,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12593,7 +12592,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12614,7 +12613,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12623,7 +12622,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -12982,7 +12981,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -13885,7 +13884,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index a49d1e71ff..646754eab3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java index 39922725f5..2c2f704c65 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2197,7 +2196,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2209,7 +2208,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2258,7 +2257,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2294,7 +2293,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2388,12 +2387,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2445,7 +2444,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2471,7 +2470,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index abd2b2d94b..cd39cde48c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bb8b78d8a3..cece92af6d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -203,7 +202,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -226,7 +225,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1573,7 +1572,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1852,7 +1851,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2506,7 +2505,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 20b222a2a2..fb239220d0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 92e8dc4386..82e707b307 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e2945568aa..e63fbfb564 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Castle.java index 4e90413baf..e5924cd118 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java index 911f5868fc..5ddd6e9447 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a61c8be3fd..e23924126e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -529,7 +528,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 89b54e3920..5f3a666fac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 4ac3a80bc1..9963bcec93 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 2deae58393..dcbe87502c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index baaf96550b..af8d094c49 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -257,7 +256,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 6e880a17fa..51140d34fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -164,7 +163,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 19b5083644..e37f2164d5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -206,7 +205,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -294,7 +293,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index f11ae5f478..5dac295e4f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index fb1a6a6fa3..0032eee89b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index e47cfb5f35..9ddee40d1e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -54,7 +53,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -98,7 +97,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 8039543b27..ec3d041ce4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Classic_2.2_Antharas/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java index 25a9aee2d3..ff983950d7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -184,7 +183,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -468,7 +467,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java index ec667fd92d..5d63ef9388 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java index 3a3da49de4..e8c502a87c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ff17f694f3..ed889ce365 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 1ec27ca276..a233b15a38 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -74,7 +73,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -107,7 +106,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 1ce86b6c3b..5964444fa3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6b3702d33a..7a972d45aa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -219,7 +218,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -228,7 +227,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index 60ba0c07e2..eda5e34f98 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1476,7 +1475,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1606,7 +1605,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1654,7 +1653,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java index 851eb1dae9..886ec14ea3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -207,7 +206,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java index a0f8b9ba9a..add8bdfcd5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -49,7 +49,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2854,7 +2853,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3921,22 +3920,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5281,7 +5280,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5314,11 +5313,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6195,7 +6194,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6440,7 +6439,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6565,12 +6564,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6629,7 +6628,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7145,7 +7144,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7230,7 +7229,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7345,7 +7344,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7635,7 +7634,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7697,7 +7696,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7772,7 +7771,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7895,7 +7894,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -7969,8 +7968,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + i, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + i, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -12348,7 +12347,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12589,7 +12588,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12641,7 +12640,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12662,7 +12661,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12671,7 +12670,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13030,7 +13029,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -13933,7 +13932,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index a49d1e71ff..646754eab3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java index 39922725f5..2c2f704c65 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2197,7 +2196,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2209,7 +2208,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2258,7 +2257,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2294,7 +2293,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2388,12 +2387,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2445,7 +2444,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2471,7 +2470,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index abd2b2d94b..cd39cde48c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5172d566a8..6315bb208f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bb8b78d8a3..cece92af6d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -203,7 +202,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -226,7 +225,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1573,7 +1572,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1852,7 +1851,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2506,7 +2505,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 20b222a2a2..fb239220d0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 92e8dc4386..82e707b307 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e2945568aa..e63fbfb564 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Castle.java index 4e90413baf..e5924cd118 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java index 911f5868fc..5ddd6e9447 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a61c8be3fd..e23924126e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -529,7 +528,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 89b54e3920..5f3a666fac 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 4ac3a80bc1..9963bcec93 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 2deae58393..dcbe87502c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 04c8ec6374..506a920b4d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -266,7 +265,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 6e880a17fa..51140d34fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -164,7 +163,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index bf6e2d3b99..847c203778 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -229,7 +228,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -317,7 +316,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index f11ae5f478..5dac295e4f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index fb1a6a6fa3..0032eee89b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index e47cfb5f35..9ddee40d1e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -54,7 +53,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -98,7 +97,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 8039543b27..ec3d041ce4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java index 9aa1b17dde..c1334f906a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java index 4ef8f44613..e5ee6c6947 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -185,7 +184,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -470,7 +469,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java index ec667fd92d..5d63ef9388 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java index 3a3da49de4..e8c502a87c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ff17f694f3..ed889ce365 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 1ec27ca276..a233b15a38 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -74,7 +73,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -107,7 +106,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 1ce86b6c3b..5964444fa3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6b3702d33a..7a972d45aa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -219,7 +218,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -228,7 +227,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index 60ba0c07e2..eda5e34f98 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1476,7 +1475,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1606,7 +1605,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1654,7 +1653,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java index 851eb1dae9..886ec14ea3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -207,7 +206,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java index 63ab809645..91e6b4e98f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -49,7 +49,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2854,7 +2853,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3921,22 +3920,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5281,7 +5280,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5314,11 +5313,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6195,7 +6194,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6440,7 +6439,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6565,12 +6564,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6629,7 +6628,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7145,7 +7144,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7230,7 +7229,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7345,7 +7344,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7635,7 +7634,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7697,7 +7696,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7772,7 +7771,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7895,7 +7894,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -7969,8 +7968,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + i, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + i, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -12348,7 +12347,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12589,7 +12588,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12641,7 +12640,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12662,7 +12661,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12671,7 +12670,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13030,7 +13029,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -13933,7 +13932,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index a49d1e71ff..646754eab3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java index 39922725f5..2c2f704c65 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2197,7 +2196,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2209,7 +2208,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2258,7 +2257,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2294,7 +2293,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2388,12 +2387,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2445,7 +2444,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2471,7 +2470,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index abd2b2d94b..cd39cde48c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5172d566a8..6315bb208f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bb8b78d8a3..cece92af6d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -203,7 +202,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -226,7 +225,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1573,7 +1572,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1852,7 +1851,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2506,7 +2505,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 20b222a2a2..fb239220d0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 92e8dc4386..82e707b307 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e2945568aa..e63fbfb564 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Castle.java index 4e90413baf..e5924cd118 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java index 911f5868fc..5ddd6e9447 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a61c8be3fd..e23924126e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -529,7 +528,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index a43066824e..088a14969d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -129,7 +128,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 4ac3a80bc1..9963bcec93 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 2deae58393..dcbe87502c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 04c8ec6374..506a920b4d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -266,7 +265,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 6e880a17fa..51140d34fa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -164,7 +163,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index bf6e2d3b99..847c203778 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -229,7 +228,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -317,7 +316,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 57acfedd38..0e816bc6b4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index fb1a6a6fa3..0032eee89b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index e47cfb5f35..9ddee40d1e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -54,7 +53,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -98,7 +97,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 8039543b27..ec3d041ce4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java index 9aa1b17dde..c1334f906a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java index 0465d67087..17a123cf13 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -188,7 +187,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -476,7 +475,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java index ec667fd92d..5d63ef9388 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java index 3a3da49de4..e8c502a87c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ff17f694f3..ed889ce365 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 8b54fe78ae..649880b289 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -76,7 +75,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -109,7 +108,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 00a6087e33..c0a1684897 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index b21f4c277c..00a18f2a46 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; @@ -41,7 +40,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 100; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 39 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 1ce86b6c3b..5964444fa3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ItemInfo.java index fd570cff28..6c19898eb7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -152,14 +151,14 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6b3702d33a..7a972d45aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -219,7 +218,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -228,7 +227,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index 43bf5e881f..df2fe0ce4d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1476,7 +1475,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1606,7 +1605,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1654,7 +1653,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java index 851eb1dae9..886ec14ea3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -207,7 +206,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java index f323e538e1..e69cdb1c0a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -50,7 +50,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2781,7 +2780,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3848,22 +3847,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5236,7 +5235,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5269,11 +5268,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6150,7 +6149,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6394,7 +6393,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6519,12 +6518,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6583,7 +6582,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7098,7 +7097,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7183,7 +7182,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7298,7 +7297,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7588,7 +7587,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7650,7 +7649,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7725,7 +7724,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7848,7 +7847,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -7922,8 +7921,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + i, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + i, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -12358,7 +12357,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12599,7 +12598,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12651,7 +12650,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12672,7 +12671,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12681,7 +12680,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13040,7 +13039,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -13948,7 +13947,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index a120178b02..8b96e26f15 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java index 39922725f5..2c2f704c65 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2197,7 +2196,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2209,7 +2208,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2258,7 +2257,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2294,7 +2293,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2388,12 +2387,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2445,7 +2444,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2471,7 +2470,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index abd2b2d94b..cd39cde48c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 5172d566a8..6315bb208f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java index bb8b78d8a3..cece92af6d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -203,7 +202,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -226,7 +225,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1573,7 +1572,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1852,7 +1851,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2506,7 +2505,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 20b222a2a2..fb239220d0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 212d62487c..04c62b79f4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e2945568aa..e63fbfb564 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Castle.java index 4e90413baf..e5924cd118 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java index 911f5868fc..5ddd6e9447 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 47955ec894..075bc837b9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -533,7 +532,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index a43066824e..088a14969d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -129,7 +128,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 4ac3a80bc1..9963bcec93 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 2deae58393..dcbe87502c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 04c8ec6374..506a920b4d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -266,7 +265,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 0ac6a6f620..2b7f1f8029 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -110,13 +109,13 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket } final int instanceId = holder.getInstanceId(); - if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > Chronos.currentTimeMillis())) + if ((instanceId > 0) && holder.isSoloInstance() && (InstanceManager.getInstance().getInstanceTime(player, instanceId) > System.currentTimeMillis())) { player.sendMessage("This transcendent instance has not reset yet."); return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); final long lastEntryTime = player.getVariables().getLong(PlayerVariables.HUNTING_ZONE_ENTRY + _zoneId, 0); if ((lastEntryTime + holder.getResetDelay()) < currentTime) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index e4ad042344..f400170476 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -107,8 +107,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket /* * if ((mentor == null) || (mentee == null)) { return false; } else if (!mentee.isOnline()) { mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); return false; } else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { - * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) { long remainingTime = - * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int + * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { long remainingTime = + * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int * minutes = (int) (remainingTime / 60); final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_BOND_WITH_A_NEW_MENTEE_IN_S1_DAY_S_S2_HOUR_S_S3_MINUTE_S); msg.addInt(days); msg.addInt(hours); msg.addInt(minutes); mentor.sendPacket(msg); return false; } else if * (mentor.getObjectId() == mentee.getObjectId()) { mentor.sendPacket(SystemMessageId.YOU_CANNOT_BECOME_YOUR_OWN_MENTEE); return false; } else if (mentee.getLevel() >= 86) { mentor.sendPacket(new * SystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) { mentor.sendPacket(SystemMessageId.INVITATION_CAN_OCCUR_ONLY_WHEN_THE_MENTEE_IS_IN_MAIN_CLASS_STATUS); return false; } // else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 6e880a17fa..51140d34fa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -22,7 +22,6 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -164,7 +163,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index bf6e2d3b99..847c203778 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -229,7 +228,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -317,7 +316,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 57acfedd38..0e816bc6b4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 49389feeea..5b3919fd7c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index 809f5af91f..da739abf54 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -29,7 +29,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -520,7 +519,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader final GlobalVariablesManager vars = GlobalVariablesManager.getInstance(); final long var = vars.getLong("FourSepulchers" + npcId, 0) + (TIME_ATTACK * 60 * 1000); - if (var > Chronos.currentTimeMillis()) + if (var > System.currentTimeMillis()) { showHtmlFile(player, npcId + "-NE.html", npc, null); return; @@ -588,7 +587,7 @@ public class FourSepulchers extends AbstractNpcAI implements IXmlReader }, TIME_ATTACK * 60 * 1000); // Save attack time - vars.set("FourSepulchers" + npcId, Chronos.currentTimeMillis()); + vars.set("FourSepulchers" + npcId, System.currentTimeMillis()); // Init progress STORED_PROGRESS.put(sepulcherId, 1); // start from 1 // Start diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java index 6b831b6110..0e47b53bf6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java @@ -16,7 +16,6 @@ */ package ai.bosses.DrChaos; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; @@ -69,7 +68,7 @@ public class DrChaos extends AbstractNpcAI // Load the reset date and time for Dr. Chaos from DB. if (status == DEAD) { - final long temp = (info.getLong("respawn_time") - Chronos.currentTimeMillis()); + final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); if (temp > 0) { startQuestTimer("reset_drchaos", temp, null, null, false); @@ -98,7 +97,7 @@ public class DrChaos extends AbstractNpcAI golem.setRunning(); // start monitoring Dr. Chaos's inactivity - _lastAttackVsGolem = Chronos.currentTimeMillis(); + _lastAttackVsGolem = System.currentTimeMillis(); startQuestTimer("golem_despawn", 60000, golem, null, true); } // Spawn the regular NPC. @@ -121,7 +120,7 @@ public class DrChaos extends AbstractNpcAI { if (npc.getId() == CHAOS_GOLEM) { - if ((_lastAttackVsGolem + 1800000) < Chronos.currentTimeMillis()) + if ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()) { // Despawn the war golem. npc.deleteMe(); @@ -163,7 +162,7 @@ public class DrChaos extends AbstractNpcAI golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0)); // start monitoring Dr. Chaos's inactivity - _lastAttackVsGolem = Chronos.currentTimeMillis(); + _lastAttackVsGolem = System.currentTimeMillis(); startQuestTimer("golem_despawn", 60000, golem, null, true); } // Check every sec if someone is in range, if found, launch one task to decrease the timer. @@ -249,7 +248,7 @@ public class DrChaos extends AbstractNpcAI // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CHAOS_GOLEM, info); return null; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index cb9368e085..282b9f8fbc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 627cc875eb..0b685d633b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java index f4b7f95009..ad87d93fe0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java @@ -16,7 +16,6 @@ */ package ai.bosses.Sailren; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -72,7 +71,7 @@ public class Sailren extends AbstractNpcAI addKillId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); addAttackId(VELOCIRAPTOR, PTEROSAUR, TREX, SAILREN); - final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - Chronos.currentTimeMillis(); + final long remain = GlobalVariablesManager.getInstance().getLong("SailrenRespawn", 0) - System.currentTimeMillis(); if (remain > 0) { STATUS = Status.DEAD; @@ -119,7 +118,7 @@ public class Sailren extends AbstractNpcAI { takeItems(player, GAZKH, 1); STATUS = Status.IN_FIGHT; - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); for (Player member : player.getParty().getMembers()) { if (member.isInsideRadius3D(npc, 1000)) @@ -238,7 +237,7 @@ public class Sailren extends AbstractNpcAI } case "CHECK_ATTACK": { - if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < Chronos.currentTimeMillis())) + if (!zone.getPlayersInside().isEmpty() && ((_lastAttack + 600000) < System.currentTimeMillis())) { cancelQuestTimer("TIME_OUT", null, null); notifyEvent("TIME_OUT", null, null); @@ -258,7 +257,7 @@ public class Sailren extends AbstractNpcAI { if (zone.isCharacterInZone(attacker)) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); } return super.onAttack(npc, attacker, damage, isSummon); } @@ -275,7 +274,7 @@ public class Sailren extends AbstractNpcAI STATUS = Status.DEAD; addSpawn(CUBIC, 27644, -6638, -2008, 0, false, 300000); final long respawnTime = RESPAWN * 3600000; - GlobalVariablesManager.getInstance().set("SailrenRespawn", Chronos.currentTimeMillis() + respawnTime); + GlobalVariablesManager.getInstance().set("SailrenRespawn", System.currentTimeMillis() + respawnTime); cancelQuestTimer("CHECK_ATTACK", null, null); cancelQuestTimer("TIME_OUT", null, null); startQuestTimer("CLEAR_STATUS", respawnTime, null, null); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 28ab796e93..bf0db534b2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.MountType; @@ -130,7 +129,7 @@ public class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -169,7 +168,7 @@ public class Valakas extends AbstractNpcAI if (status == FIGHTING) { // stores current time for inactivity task. - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); startQuestTimer("regen_task", 60000, valakas, null, true); startQuestTimer("skill_task", 2000, valakas, null, true); @@ -197,7 +196,7 @@ public class Valakas extends AbstractNpcAI if (event.equalsIgnoreCase("beginning")) { // Stores current time - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); // Teleport Valakas to his lair. npc.teleToLocation(VALAKAS_LAIR); @@ -221,7 +220,7 @@ public class Valakas extends AbstractNpcAI else if (event.equalsIgnoreCase("regen_task")) { // Inactivity task - 15min - if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < Chronos.currentTimeMillis())) + if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis())) { npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); npc.teleToLocation(VALAKAS_REGENERATION_LOC); @@ -417,7 +416,7 @@ public class Valakas extends AbstractNpcAI npc.setTarget(attacker); npc.doCast(SkillData.getInstance().getSkill(4258, 1)); } - _timeTracker = Chronos.currentTimeMillis(); + _timeTracker = System.currentTimeMillis(); return super.onAttack(npc, attacker, damage, isSummon); } @@ -448,7 +447,7 @@ public class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index e47cfb5f35..9ddee40d1e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -54,7 +53,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -98,7 +97,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 8039543b27..ec3d041ce4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index a87b60a731..aec506035a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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; @@ -119,7 +118,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java index c724d52d0b..245fecd774 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -180,7 +179,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -460,7 +459,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java index ec667fd92d..5d63ef9388 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java index 3a3da49de4..e8c502a87c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index ff17f694f3..ed889ce365 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 7bc7be8487..8f3b135fae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MINUTE_S_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 8bcefce345..ac74d17fd7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.PrimeShopData; @@ -73,7 +72,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -106,7 +105,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 1136968690..80a8f3f503 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -157,7 +156,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -173,7 +172,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 7f156f89da..85bb3fbd83 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -521,7 +520,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -556,7 +555,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -615,7 +614,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index a579be6a5f..d31dc42ef1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -61,7 +60,7 @@ public class Lottery _prize = Config.ALT_LOTTERY_PRIZE; _isSellingTickets = false; _isStarted = false; - _enddate = Chronos.currentTimeMillis(); + _enddate = System.currentTimeMillis(); if (Config.ALLOW_LOTTERY) { (new startLottery()).run(); @@ -141,20 +140,20 @@ public class Lottery { _prize = rset.getLong("prize"); _enddate = rset.getLong("enddate"); - if (_enddate <= (Chronos.currentTimeMillis() + (2 * MINUTE))) + if (_enddate <= (System.currentTimeMillis() + (2 * MINUTE))) { (new finishLottery()).run(); return; } - if (_enddate > Chronos.currentTimeMillis()) + if (_enddate > System.currentTimeMillis()) { _isStarted = true; - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); - if (_enddate > (Chronos.currentTimeMillis() + (12 * MINUTE))) + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); + if (_enddate > (System.currentTimeMillis() + (12 * MINUTE))) { _isSellingTickets = true; - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); } return; } @@ -186,8 +185,8 @@ public class Lottery _enddate = finishtime.getTimeInMillis(); } - ThreadPool.schedule(new stopSellingTickets(), _enddate - Chronos.currentTimeMillis() - (10 * MINUTE)); - ThreadPool.schedule(new finishLottery(), _enddate - Chronos.currentTimeMillis()); + ThreadPool.schedule(new stopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE)); + ThreadPool.schedule(new finishLottery(), _enddate - System.currentTimeMillis()); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(INSERT_LOTTERY)) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 7659ca0248..af7aa3d726 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java index 48c6ce61eb..72b752f321 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.item.ItemTemplate; @@ -145,14 +144,14 @@ public class ItemInfo } _option = item.getEnchantOptions(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(Item item, int change) { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Petition.java index fcb607f4b0..e5f9b7f1ff 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a8d51da07b..5e01ec47a9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -221,7 +220,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -230,7 +229,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8adb556efe..8a09e693b6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1475,7 +1474,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1605,7 +1604,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1653,7 +1652,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java index b101fcd78d..c9b1e3ad5f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -204,7 +203,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 8941f08827..dad026cb86 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -47,7 +47,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -2839,7 +2838,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3904,22 +3903,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5263,7 +5262,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5296,11 +5295,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6176,7 +6175,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6421,7 +6420,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6546,12 +6545,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6610,7 +6609,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7110,7 +7109,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7195,7 +7194,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7310,7 +7309,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7600,7 +7599,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7662,7 +7661,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7737,7 +7736,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -7860,7 +7859,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -7934,8 +7933,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + i, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + i, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -12310,7 +12309,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12551,7 +12550,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12603,7 +12602,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12624,7 +12623,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12633,7 +12632,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -12992,7 +12991,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -13896,7 +13895,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index a49d1e71ff..646754eab3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java index 1cb6626fdc..ad3f498422 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2197,7 +2196,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return false; @@ -2209,7 +2208,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(target.getName()); @@ -2258,7 +2257,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_MAY_NOT_ACCEPT_ANY_CLAN_WITHIN_A_DAY_AFTER_EXPELLING_ANOTHER_CLAN); return false; @@ -2294,7 +2293,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2388,12 +2387,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2445,7 +2444,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_HAS_BEEN_DISSOLVED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2471,7 +2470,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index abd2b2d94b..cd39cde48c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index fd808f8ad2..f3e2f5c93d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 75b12c93ad..e4c3f180ae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -551,7 +550,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -561,7 +560,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -578,7 +577,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 5e66de9d5a..45f6cab44a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemOptionsData; @@ -195,7 +194,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -218,7 +217,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1513,7 +1512,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1782,7 +1781,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2156,7 +2155,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 06760564d7..9e96d4e170 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 20b222a2a2..fb239220d0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 92e8dc4386..82e707b307 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -766,7 +765,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -787,7 +786,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -801,7 +800,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index e2945568aa..e63fbfb564 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index b6faf48317..9cabf6f49a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -101,7 +100,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -327,7 +326,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java index 4e90413baf..e5924cd118 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java index 856f2235df..0b9cb088d1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1446,9 +1445,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index df53b329e5..c2914420bc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 362846a3b7..fa6acab694 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 7a6a9a8c23..88d946f2b4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index bec98de359..9347aa0d61 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -521,7 +520,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_RECENTLY_BEEN_DISMISSED_FROM_A_CLAN_YOU_ARE_NOT_ALLOWED_TO_JOIN_ANOTHER_CLAN_FOR_24_HOURS); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4d7d5ce232..88772a4e63 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -127,7 +126,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // fast auto-enchant cheat check - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 2000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 2000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 8e7c3ee9fe..d1eb9d9ca9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.CLAN_MEMBER_S1_HAS_BEEN_EXPELLED); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index 4ac3a80bc1..9963bcec93 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AFTER_A_CLAN_MEMBER_IS_DISMISSED_FROM_A_CLAN_THE_CLAN_MUST_WAIT_AT_LEAST_A_DAY_BEFORE_ACCEPTING_A_NEW_MEMBER); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 2deae58393..dcbe87502c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index d23918130b..3580485271 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 493e52e6bd..4525517ddb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -268,7 +267,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index ff61b200fb..c32c99e6b8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.World; @@ -119,9 +118,9 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } - else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) + else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { - long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; + long remainingTime = (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 1961fae884..6ad511c398 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -131,7 +130,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index b422622dc3..c9b005df4a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -141,7 +140,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 23a82c946f..18c4ec91a3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -165,7 +164,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -253,7 +252,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index f11ae5f478..5dac295e4f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 3c5a32808a..028447490c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index ffac73f2ef..2dce74f533 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -106,7 +105,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 1dfa99be25..6215ae2f85 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -91,7 +90,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -111,7 +110,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -126,7 +125,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java index d7c147f4be..1de0155ced 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java index 567e8b2334..86b549221f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java @@ -16,7 +16,6 @@ */ package ai.areas.OrcBarracks.Tarba; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -47,7 +46,7 @@ public class Tarba extends AbstractNpcAI { if (event.equals("teleport")) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((npc.getId() == TARBA) && ((player.getVariables().getLong(TARBA_TIME_VAR, 0) + 86400000) < currentTime)) { player.getVariables().set(TARBA_TIME_VAR, currentTime); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index fb1a6a6fa3..0032eee89b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index 09ba572aa9..5061d4fc27 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index ee8eb3ba2f..9214fdb028 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -55,7 +54,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -99,7 +98,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 4fa3410e91..95c47896a6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java index 20d9eeacde..0e8a9686d7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java @@ -16,7 +16,6 @@ */ package events.BlossomFestival; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; @@ -60,7 +59,7 @@ public class BlossomFestival extends LongTimeEvent synchronized (REWARD_LOCK) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (player.getVariables().getLong(REWARD_VAR, 0) < currentTime) { player.getVariables().set(REWARD_VAR, currentTime + 86400000); // 24 hours diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java index 6290b10835..0bcd2b11ca 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -53,19 +52,19 @@ public class SayhaGraceSupport extends AbstractEffect final double rnd = Rnd.nextDouble() * 100; if (rnd <= 0.1) // 4h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 4)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 4)); } else if (rnd <= 0.3) // 3h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 3)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 3)); } else if (rnd <= 0.6) // 2h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 2)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 2)); } else if (rnd <= 1.1) // 1h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 1)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 1)); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java index 40cb212cfd..ac0888bbb2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java @@ -16,7 +16,6 @@ */ package handlers.itemhandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class LimitedSayha implements IItemHandler break; } } - if ((time > 0) && player.setLimitedSayhaGraceEndTime(Chronos.currentTimeMillis() + time)) + if ((time > 0) && player.setLimitedSayhaGraceEndTime(System.currentTimeMillis() + time)) { player.destroyItem("LimitedSayha potion", item, 1, player, true); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Classic_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java index 9aa1b17dde..c1334f906a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java index d0ee9c3c7d..cb3d884cfc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -195,7 +194,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -490,7 +489,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/Shutdown.java index ec667fd92d..5d63ef9388 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java index d587355921..fc1c7cd3dc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MIN_YOU_HAVE_S2_POINT_S_LEFT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 7fe48b0a91..757dfa598e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 2ce3e815cc..5f3b8df714 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MIN_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index f9b16049ea..8fca417f44 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.LimitShopData; @@ -78,7 +77,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -111,7 +110,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 161e558dd1..e44b841741 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 123042a55d..88cbfb4fd0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -525,7 +524,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -560,7 +559,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -619,7 +618,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index 30d8464796..7cacf4cb51 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; @@ -41,7 +40,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 500; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 39 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CursedWeapon.java index b2063e96f5..f7e8de7ae3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ItemInfo.java index 0b12e950c3..f06b0abe7a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -155,7 +154,7 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; _petData = item.getActingPlayer() != null ? item.getActingPlayer().getPetEvolve(getObjectId()) : null; } @@ -163,7 +162,7 @@ public class ItemInfo { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Petition.java index 6a274245d0..8b79a94469 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java index bc4e8caa37..35655c917e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -220,7 +219,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -229,7 +228,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } @@ -603,7 +602,7 @@ public class Attackable extends Npc } if (useVitalityRate()) { - if (attacker.getSayhaGraceSupportEndTime() < Chronos.currentTimeMillis()) + if (attacker.getSayhaGraceSupportEndTime() < System.currentTimeMillis()) { attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java index 27e70e7f9f..6444457afa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1479,7 +1478,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1609,7 +1608,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1657,7 +1656,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java index f1951e8847..ca447b23b2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -207,7 +206,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java index ab5a83b5d0..39a394da64 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -50,7 +50,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2858,7 +2857,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3941,22 +3940,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5320,7 +5319,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5353,11 +5352,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6285,7 +6284,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6529,7 +6528,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6656,12 +6655,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6721,7 +6720,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7248,7 +7247,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7335,7 +7334,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7450,7 +7449,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7740,7 +7739,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7802,7 +7801,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7877,7 +7876,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -8000,7 +7999,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.STAT_POINTS, UserInfoType.STAT_ABILITIES, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -8074,8 +8073,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + i, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + i, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -11837,7 +11836,7 @@ public class Player extends Playable public void setSayhaGraceSupportEndTime(long endTime) { - if (getVariables().getLong(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, 0) < Chronos.currentTimeMillis()) + if (getVariables().getLong(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, 0) < System.currentTimeMillis()) { getVariables().set(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, endTime); sendPacket(new ExUserBoostStat(this, BonusExpType.VITALITY)); @@ -12629,7 +12628,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12870,7 +12869,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12922,7 +12921,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -12943,7 +12942,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -12952,7 +12951,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13311,7 +13310,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14220,7 +14219,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 1c7b874b20..9abdbafbf6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 2e3494f542..248d1240c7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.stat; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.ElementalType; import org.l2jmobius.gameserver.enums.PartySmallWindowUpdateType; @@ -490,7 +489,7 @@ public class PlayerStat extends PlayableStat { return getValue(Stat.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER); } - if (getActiveChar().getLimitedSayhaGraceEndTime() > Chronos.currentTimeMillis()) + if (getActiveChar().getLimitedSayhaGraceEndTime() > System.currentTimeMillis()) { return Config.RATE_LIMITED_SAYHA_GRACE_EXP_MULTIPLIER; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java index cd0b97041b..8d4daccfeb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -506,7 +505,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -546,7 +545,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1084,12 +1083,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2197,7 +2196,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return false; @@ -2209,7 +2208,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(target.getName()); @@ -2258,7 +2257,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_CAN_ACCEPT_A_NEW_CLAN_IN_THE_ALLIANCE_IN_24_H_AFTER_DISMISSING_ANOTHER_ONE); return false; @@ -2294,7 +2293,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2388,12 +2387,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2445,7 +2444,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_IS_DISBANDED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2471,7 +2470,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 74e1e27b88..e4c1e2f57c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index c6a359d343..e8e00fb9ba 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 6d893c11e6..2fd8f5e328 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -563,7 +562,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -573,7 +572,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -590,7 +589,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java index d3d195d079..3a6216acbe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -204,7 +203,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -227,7 +226,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1576,7 +1575,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1855,7 +1854,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2509,7 +2508,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index d51a9b03d2..92bd38e180 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 992b4412d5..bca8f1496a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 212d62487c..04c62b79f4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 5b1773f5d8..aebeb46ec7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 22074f54c9..a37f196024 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -300,7 +299,7 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (endtime > Chronos.currentTimeMillis()) + if (endtime > System.currentTimeMillis()) { ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } @@ -335,7 +334,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index fcc850371b..8a10069517 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Castle.java index 210c516669..729c5dcb38 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java index 8618a787ae..c53db37e26 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 548befc4da..c3511dae34 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 6ba2c80c6b..b9e6eab661 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index e8a79f6866..a56652f041 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -540,7 +539,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_ARE_DISMISSED_FROM_A_CLAN_YOU_CANNOT_JOIN_ANOTHER_FOR_24_H); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 3f376ae057..5e0f3b078c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -130,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check // Lowered value to 500 (from 2000) On Essence, some enchantments are much faster than normal ones. - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 500)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 500)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index f7ce118e6f..817d811eac 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index ae0b70c5bc..ff80a004ca 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 73c7d4aa2c..479f357641 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index a22d935cfd..57d3f3660b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -65,12 +64,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(player.getName()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 356308bbbd..29e525f1b0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 743f92515d..7ff8b8c71b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 2fa65b56f3..990e7f91a0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -279,7 +278,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 4d2e52f08a..b2aa5d3834 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -109,7 +108,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final int instanceId = holder.getInstanceId(); if ((instanceId > 0) && holder.isSoloInstance()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index e4ad042344..f400170476 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -107,8 +107,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket /* * if ((mentor == null) || (mentee == null)) { return false; } else if (!mentee.isOnline()) { mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); return false; } else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { - * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) { long remainingTime = - * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int + * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { long remainingTime = + * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int * minutes = (int) (remainingTime / 60); final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_BOND_WITH_A_NEW_MENTEE_IN_S1_DAY_S_S2_HOUR_S_S3_MINUTE_S); msg.addInt(days); msg.addInt(hours); msg.addInt(minutes); mentor.sendPacket(msg); return false; } else if * (mentor.getObjectId() == mentee.getObjectId()) { mentor.sendPacket(SystemMessageId.YOU_CANNOT_BECOME_YOUR_OWN_MENTEE); return false; } else if (mentee.getLevel() >= 86) { mentor.sendPacket(new * SystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) { mentor.sendPacket(SystemMessageId.INVITATION_CAN_OCCUR_ONLY_WHEN_THE_MENTEE_IS_IN_MAIN_CLASS_STATUS); return false; } // else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index e6cd27430c..780cc168fe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -4,7 +4,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -183,7 +182,7 @@ public class ExPetEquipItem implements IClientIncomingPacket { Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null); pet.useEquippableItem(transferedItem, false); - }, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + }, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 65fb6e4413..0dea0570f4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -139,7 +138,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java index 03e69980fa..3aa9e905a0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.teleports; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.data.xml.RaidTeleportListData; import org.l2jmobius.gameserver.enums.RaidBossStatus; @@ -121,9 +120,9 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket } final int price; - if ((Chronos.currentTimeMillis() - player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) > 86400000) + if ((System.currentTimeMillis() - player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) > 86400000) { - player.getVariables().set("LastFreeRaidTeleportTime", Chronos.currentTimeMillis()); + player.getVariables().set("LastFreeRaidTeleportTime", System.currentTimeMillis()); price = 0; } else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index a5af63da43..052bf88e69 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -230,7 +229,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -319,7 +318,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 57acfedd38..0e816bc6b4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 96224b45ff..36d05e9317 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index ae6d0f7aad..21e90a66ea 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -95,7 +94,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -115,7 +114,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -130,7 +129,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 21e417bf00..32c5d08d8c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java index de282361d9..70f268a934 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java @@ -19,7 +19,6 @@ package ai.areas.Hellbound; import java.util.Calendar; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.zone.ZoneType; @@ -65,7 +64,7 @@ public class IvoryTowerTeleportZones extends AbstractNpcAI { disableZones(); } - }, (calendar.getTimeInMillis() + 86400000) - Chronos.currentTimeMillis(), 86400000); // Check every 24 hours. + }, (calendar.getTimeInMillis() + 86400000) - System.currentTimeMillis(), 86400000); // Check every 24 hours. } private void enableZones() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java index 567e8b2334..86b549221f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java @@ -16,7 +16,6 @@ */ package ai.areas.OrcBarracks.Tarba; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -47,7 +46,7 @@ public class Tarba extends AbstractNpcAI { if (event.equals("teleport")) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((npc.getId() == TARBA) && ((player.getVariables().getLong(TARBA_TIME_VAR, 0) + 86400000) < currentTime)) { player.getVariables().set(TARBA_TIME_VAR, currentTime); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index fb1a6a6fa3..0032eee89b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index b43519c005..6c23250016 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index ee8eb3ba2f..9214fdb028 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -55,7 +54,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -99,7 +98,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 6870955ced..05751de2da 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java index 20d9eeacde..0e8a9686d7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java @@ -16,7 +16,6 @@ */ package events.BlossomFestival; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; @@ -60,7 +59,7 @@ public class BlossomFestival extends LongTimeEvent synchronized (REWARD_LOCK) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (player.getVariables().getLong(REWARD_VAR, 0) < currentTime) { player.getVariables().set(REWARD_VAR, currentTime + 86400000); // 24 hours diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java index 6290b10835..0bcd2b11ca 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -53,19 +52,19 @@ public class SayhaGraceSupport extends AbstractEffect final double rnd = Rnd.nextDouble() * 100; if (rnd <= 0.1) // 4h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 4)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 4)); } else if (rnd <= 0.3) // 3h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 3)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 3)); } else if (rnd <= 0.6) // 2h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 2)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 2)); } else if (rnd <= 1.1) // 1h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 1)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 1)); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java index 40cb212cfd..ac0888bbb2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java @@ -16,7 +16,6 @@ */ package handlers.itemhandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class LimitedSayha implements IItemHandler break; } } - if ((time > 0) && player.setLimitedSayhaGraceEndTime(Chronos.currentTimeMillis() + time)) + if ((time > 0) && player.setLimitedSayhaGraceEndTime(System.currentTimeMillis() + time)) { player.destroyItem("LimitedSayha potion", item, 1, player, true); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java index 9aa1b17dde..c1334f906a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/GameServer.java index dc33e26261..d4dd118f1d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -200,7 +199,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -500,7 +499,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/Shutdown.java index ec667fd92d..5d63ef9388 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java index d587355921..fc1c7cd3dc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MIN_YOU_HAVE_S2_POINT_S_LEFT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 7fe48b0a91..757dfa598e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 2ce3e815cc..5f3b8df714 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MIN_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index 27a2972865..9a0ff18983 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.LimitShopData; @@ -78,7 +77,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -111,7 +110,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 161e558dd1..e44b841741 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 123042a55d..88cbfb4fd0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -525,7 +524,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -560,7 +559,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -619,7 +618,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java index 05038a2fe8..d25616e102 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; @@ -70,9 +69,9 @@ public class PurgeRankingManager { // Weekly rewards. final long lastPurgeRewards = GlobalVariablesManager.getInstance().getLong(GlobalVariablesManager.PURGE_REWARD_TIME, 0); - if ((Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) && ((Chronos.currentTimeMillis() - lastPurgeRewards) > (604800000 /* 1 week */ - 600000 /* task delay x2 */))) + if ((Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) && ((System.currentTimeMillis() - lastPurgeRewards) > (604800000 /* 1 week */ - 600000 /* task delay x2 */))) { - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.PURGE_REWARD_TIME, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.PURGE_REWARD_TIME, System.currentTimeMillis()); for (int category = 1; category <= 7; category++) { if (getTop5(category) != null) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index 681e2bb219..bdb6d2a7b4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PetDataTable; import org.l2jmobius.gameserver.model.StatSet; @@ -42,7 +41,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 500; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 39 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CursedWeapon.java index b2063e96f5..f7e8de7ae3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ItemInfo.java index 0b12e950c3..f06b0abe7a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -155,7 +154,7 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; _petData = item.getActingPlayer() != null ? item.getActingPlayer().getPetEvolve(getObjectId()) : null; } @@ -163,7 +162,7 @@ public class ItemInfo { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Petition.java index 6a274245d0..8b79a94469 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4377fb75eb..b35b4c9f45 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -220,7 +219,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -229,7 +228,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } @@ -608,7 +607,7 @@ public class Attackable extends Npc } if (useVitalityRate()) { - if (attacker.getSayhaGraceSupportEndTime() < Chronos.currentTimeMillis()) + if (attacker.getSayhaGraceSupportEndTime() < System.currentTimeMillis()) { attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java index 89a7b53215..d026c82b49 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1486,7 +1485,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1616,7 +1615,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1664,7 +1663,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java index f1951e8847..ca447b23b2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -207,7 +206,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java index e79d01e973..3bf9c707e9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -50,7 +50,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2899,7 +2898,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3982,22 +3981,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5361,7 +5360,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5394,11 +5393,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6330,7 +6329,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6574,7 +6573,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6701,12 +6700,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6766,7 +6765,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7314,7 +7313,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7401,7 +7400,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7516,7 +7515,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7806,7 +7805,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7868,7 +7867,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7943,7 +7942,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -8066,7 +8065,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.STAT_POINTS, UserInfoType.STAT_ABILITIES, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -8140,8 +8139,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + i, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + i, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(i, ThreadPool.schedule(new HennaDurationTask(this, i), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -11904,7 +11903,7 @@ public class Player extends Playable public void setSayhaGraceSupportEndTime(long endTime) { - if (getVariables().getLong(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, 0) < Chronos.currentTimeMillis()) + if (getVariables().getLong(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, 0) < System.currentTimeMillis()) { getVariables().set(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, endTime); sendPacket(new ExUserBoostStat(this, BonusExpType.VITALITY)); @@ -12696,7 +12695,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -12937,7 +12936,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -12989,7 +12988,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -13010,7 +13009,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -13019,7 +13018,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13389,7 +13388,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14298,7 +14297,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 8bb6102196..c538bceb89 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_YOUR_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 2e3494f542..248d1240c7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.stat; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.ElementalType; import org.l2jmobius.gameserver.enums.PartySmallWindowUpdateType; @@ -490,7 +489,7 @@ public class PlayerStat extends PlayableStat { return getValue(Stat.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER); } - if (getActiveChar().getLimitedSayhaGraceEndTime() > Chronos.currentTimeMillis()) + if (getActiveChar().getLimitedSayhaGraceEndTime() > System.currentTimeMillis()) { return Config.RATE_LIMITED_SAYHA_GRACE_EXP_MULTIPLIER; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java index 0657c2c0ea..845f42b7d9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -36,7 +36,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -525,7 +524,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -565,7 +564,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1105,12 +1104,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2219,7 +2218,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return false; @@ -2231,7 +2230,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(target.getName()); @@ -2281,7 +2280,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_CAN_ACCEPT_A_NEW_CLAN_IN_THE_ALLIANCE_IN_24_H_AFTER_DISMISSING_ANOTHER_ONE); return false; @@ -2317,7 +2316,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2411,12 +2410,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2468,7 +2467,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_IS_DISBANDED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2495,7 +2494,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 74e1e27b88..e4c1e2f57c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index c6a359d343..e8e00fb9ba 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 6d893c11e6..2fd8f5e328 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -563,7 +562,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -573,7 +572,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -590,7 +589,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 32d7b19dc0..e0248150da 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java index d3d195d079..3a6216acbe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -204,7 +203,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -227,7 +226,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1576,7 +1575,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1855,7 +1854,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2509,7 +2508,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index d51a9b03d2..92bd38e180 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 992b4412d5..bca8f1496a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 212d62487c..04c62b79f4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 5b1773f5d8..aebeb46ec7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 22074f54c9..a37f196024 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -300,7 +299,7 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (endtime > Chronos.currentTimeMillis()) + if (endtime > System.currentTimeMillis()) { ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } @@ -335,7 +334,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 2fb931a64c..a596f81eca 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Castle.java index 210c516669..729c5dcb38 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java index 8618a787ae..c53db37e26 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 548befc4da..c3511dae34 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 6ba2c80c6b..b9e6eab661 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 7cb3afbe45..fdb3636eb7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -547,7 +546,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_ARE_DISMISSED_FROM_A_CLAN_YOU_CANNOT_JOIN_ANOTHER_FOR_24_H); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index c8265aa875..a412020345 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -130,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check // Lowered value to 500 (from 2000) On Essence, some enchantments are much faster than normal ones. - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 500)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 500)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index ae1ce1bebe..1c6df952cc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index b0316c2a16..3d5ac76a53 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 73c7d4aa2c..479f357641 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index d8d4b53eb5..a8fdda6dd1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(player.getName()); @@ -124,7 +123,7 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP // This activates the clan tab on the new member. PledgeShowMemberListAll.sendAllTo(player); player.setClanJoinExpiryTime(0); - player.setClanJoinTime(Chronos.currentTimeMillis()); + player.setClanJoinTime(System.currentTimeMillis()); player.broadcastUserInfo(); ClanEntryManager.getInstance().removePlayerApplication(_clanId, player.getObjectId()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 1999f01379..591f38d131 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -105,7 +104,7 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket // This activates the clan tab on the new member. PledgeShowMemberListAll.sendAllTo(target); target.setClanJoinExpiryTime(0); - player.setClanJoinTime(Chronos.currentTimeMillis()); + player.setClanJoinTime(System.currentTimeMillis()); target.broadcastUserInfo(); ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 356308bbbd..29e525f1b0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 743f92515d..7ff8b8c71b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 95ca234046..2c12de214e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -288,7 +287,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 4d2e52f08a..b2aa5d3834 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -109,7 +108,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final int instanceId = holder.getInstanceId(); if ((instanceId > 0) && holder.isSoloInstance()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index e4ad042344..f400170476 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -107,8 +107,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket /* * if ((mentor == null) || (mentee == null)) { return false; } else if (!mentee.isOnline()) { mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); return false; } else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { - * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) { long remainingTime = - * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int + * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { long remainingTime = + * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int * minutes = (int) (remainingTime / 60); final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_BOND_WITH_A_NEW_MENTEE_IN_S1_DAY_S_S2_HOUR_S_S3_MINUTE_S); msg.addInt(days); msg.addInt(hours); msg.addInt(minutes); mentor.sendPacket(msg); return false; } else if * (mentor.getObjectId() == mentee.getObjectId()) { mentor.sendPacket(SystemMessageId.YOU_CANNOT_BECOME_YOUR_OWN_MENTEE); return false; } else if (mentee.getLevel() >= 86) { mentor.sendPacket(new * SystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) { mentor.sendPacket(SystemMessageId.INVITATION_CAN_OCCUR_ONLY_WHEN_THE_MENTEE_IS_IN_MAIN_CLASS_STATUS); return false; } // else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index e6cd27430c..780cc168fe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -4,7 +4,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -183,7 +182,7 @@ public class ExPetEquipItem implements IClientIncomingPacket { Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null); pet.useEquippableItem(transferedItem, false); - }, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + }, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java index e0975d5bb7..5bd8eb9386 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV3; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -90,7 +89,7 @@ public class RequestExPledgeEnemyRegister implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); client.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java index c1b9bfc2c1..1aa48d30b1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgedonation; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -50,6 +49,6 @@ public class RequestExPledgeDonationInfo implements IClientIncomingPacket return; } - player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (player.getClanJoinTime() + 86400000) < Chronos.currentTimeMillis())); + player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (player.getClanJoinTime() + 86400000) < System.currentTimeMillis())); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 65fb6e4413..0dea0570f4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -139,7 +138,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java index 03e69980fa..3aa9e905a0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.teleports; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.data.xml.RaidTeleportListData; import org.l2jmobius.gameserver.enums.RaidBossStatus; @@ -121,9 +120,9 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket } final int price; - if ((Chronos.currentTimeMillis() - player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) > 86400000) + if ((System.currentTimeMillis() - player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) > 86400000) { - player.getVariables().set("LastFreeRaidTeleportTime", Chronos.currentTimeMillis()); + player.getVariables().set("LastFreeRaidTeleportTime", System.currentTimeMillis()); price = 0; } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index a5af63da43..052bf88e69 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -230,7 +229,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -319,7 +318,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 57acfedd38..0e816bc6b4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 96224b45ff..36d05e9317 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index ae6d0f7aad..21e90a66ea 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -95,7 +94,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -115,7 +114,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -130,7 +129,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 21e417bf00..32c5d08d8c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java index de282361d9..70f268a934 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java @@ -19,7 +19,6 @@ package ai.areas.Hellbound; import java.util.Calendar; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.zone.ZoneType; @@ -65,7 +64,7 @@ public class IvoryTowerTeleportZones extends AbstractNpcAI { disableZones(); } - }, (calendar.getTimeInMillis() + 86400000) - Chronos.currentTimeMillis(), 86400000); // Check every 24 hours. + }, (calendar.getTimeInMillis() + 86400000) - System.currentTimeMillis(), 86400000); // Check every 24 hours. } private void enableZones() diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java index 567e8b2334..86b549221f 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java @@ -16,7 +16,6 @@ */ package ai.areas.OrcBarracks.Tarba; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -47,7 +46,7 @@ public class Tarba extends AbstractNpcAI { if (event.equals("teleport")) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((npc.getId() == TARBA) && ((player.getVariables().getLong(TARBA_TIME_VAR, 0) + 86400000) < currentTime)) { player.getVariables().set(TARBA_TIME_VAR, currentTime); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 5f2475fd42..03cd485ffd 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index b43519c005..6c23250016 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index ee8eb3ba2f..9214fdb028 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -55,7 +54,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -99,7 +98,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 6870955ced..05751de2da 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java index 20d9eeacde..0e8a9686d7 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java @@ -16,7 +16,6 @@ */ package events.BlossomFestival; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; @@ -60,7 +59,7 @@ public class BlossomFestival extends LongTimeEvent synchronized (REWARD_LOCK) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (player.getVariables().getLong(REWARD_VAR, 0) < currentTime) { player.getVariables().set(REWARD_VAR, currentTime + 86400000); // 24 hours diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java index 6290b10835..0bcd2b11ca 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -53,19 +52,19 @@ public class SayhaGraceSupport extends AbstractEffect final double rnd = Rnd.nextDouble() * 100; if (rnd <= 0.1) // 4h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 4)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 4)); } else if (rnd <= 0.3) // 3h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 3)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 3)); } else if (rnd <= 0.6) // 2h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 2)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 2)); } else if (rnd <= 1.1) // 1h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 1)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 1)); } } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java index 40cb212cfd..ac0888bbb2 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java @@ -16,7 +16,6 @@ */ package handlers.itemhandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class LimitedSayha implements IItemHandler break; } } - if ((time > 0) && player.setLimitedSayhaGraceEndTime(Chronos.currentTimeMillis() + time)) + if ((time > 0) && player.setLimitedSayhaGraceEndTime(System.currentTimeMillis() + time)) { player.destroyItem("LimitedSayha potion", item, 1, player, true); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java index 9aa1b17dde..c1334f906a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/GameServer.java index dc33e26261..d4dd118f1d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -200,7 +199,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -500,7 +499,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/Shutdown.java index b94448f112..d51e9c31bf 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/BotReportTable.java index d587355921..fc1c7cd3dc 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MIN_YOU_HAVE_S2_POINT_S_LEFT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 7fe48b0a91..757dfa598e 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 2ce3e815cc..5f3b8df714 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MIN_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ba237be662..2d27475d04 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.LimitShopData; @@ -78,7 +77,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -111,7 +110,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 161e558dd1..e44b841741 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 123042a55d..88cbfb4fd0 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -525,7 +524,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -560,7 +559,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -619,7 +618,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java index 05038a2fe8..d25616e102 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; @@ -70,9 +69,9 @@ public class PurgeRankingManager { // Weekly rewards. final long lastPurgeRewards = GlobalVariablesManager.getInstance().getLong(GlobalVariablesManager.PURGE_REWARD_TIME, 0); - if ((Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) && ((Chronos.currentTimeMillis() - lastPurgeRewards) > (604800000 /* 1 week */ - 600000 /* task delay x2 */))) + if ((Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) && ((System.currentTimeMillis() - lastPurgeRewards) > (604800000 /* 1 week */ - 600000 /* task delay x2 */))) { - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.PURGE_REWARD_TIME, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.PURGE_REWARD_TIME, System.currentTimeMillis()); for (int category = 1; category <= 7; category++) { if (getTop5(category) != null) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index 681e2bb219..bdb6d2a7b4 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PetDataTable; import org.l2jmobius.gameserver.model.StatSet; @@ -42,7 +41,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 500; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 39 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/CursedWeapon.java index c9cf45a6b9..7947edf57e 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ItemInfo.java index 0b12e950c3..f06b0abe7a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; @@ -155,7 +154,7 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; _petData = item.getActingPlayer() != null ? item.getActingPlayer().getPetEvolve(getObjectId()) : null; } @@ -163,7 +162,7 @@ public class ItemInfo { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Petition.java index 49e613a3fc..d6f2dbf32e 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java index ee9eae0d6b..8c7fcba7c9 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -220,7 +219,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -229,7 +228,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } @@ -608,7 +607,7 @@ public class Attackable extends Npc } if (useVitalityRate()) { - if (attacker.getSayhaGraceSupportEndTime() < Chronos.currentTimeMillis()) + if (attacker.getSayhaGraceSupportEndTime() < System.currentTimeMillis()) { attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java index b116eab9cd..976da9b0f8 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1486,7 +1485,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1616,7 +1615,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1664,7 +1663,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Npc.java index f1951e8847..ca447b23b2 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -207,7 +206,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java index 2f78c1e331..43e625e826 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -50,7 +50,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2905,7 +2904,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3988,22 +3987,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5367,7 +5366,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5400,11 +5399,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6336,7 +6335,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6580,7 +6579,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6707,12 +6706,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6772,7 +6771,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7322,7 +7321,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7409,7 +7408,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7524,7 +7523,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7814,7 +7813,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7876,7 +7875,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7951,7 +7950,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -8075,7 +8074,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.STAT_POINTS, UserInfoType.STAT_ABILITIES, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -8153,8 +8152,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + slotId, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(slotId, ThreadPool.schedule(new HennaDurationTask(this, slotId), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + slotId, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(slotId, ThreadPool.schedule(new HennaDurationTask(this, slotId), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -12026,7 +12025,7 @@ public class Player extends Playable public void setSayhaGraceSupportEndTime(long endTime) { - if (getVariables().getLong(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, 0) < Chronos.currentTimeMillis()) + if (getVariables().getLong(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, 0) < System.currentTimeMillis()) { getVariables().set(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, endTime); sendPacket(new ExUserBoostStat(this, BonusExpType.VITALITY)); @@ -12818,7 +12817,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -13059,7 +13058,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -13111,7 +13110,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -13132,7 +13131,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -13141,7 +13140,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13511,7 +13510,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14420,7 +14419,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5c4e410c17..3076f0864a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_S1_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 2e3494f542..248d1240c7 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.stat; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.ElementalType; import org.l2jmobius.gameserver.enums.PartySmallWindowUpdateType; @@ -490,7 +489,7 @@ public class PlayerStat extends PlayableStat { return getValue(Stat.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER); } - if (getActiveChar().getLimitedSayhaGraceEndTime() > Chronos.currentTimeMillis()) + if (getActiveChar().getLimitedSayhaGraceEndTime() > System.currentTimeMillis()) { return Config.RATE_LIMITED_SAYHA_GRACE_EXP_MULTIPLIER; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java index 0657c2c0ea..845f42b7d9 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -36,7 +36,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -525,7 +524,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -565,7 +564,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1105,12 +1104,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2219,7 +2218,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return false; @@ -2231,7 +2230,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(target.getName()); @@ -2281,7 +2280,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_CAN_ACCEPT_A_NEW_CLAN_IN_THE_ALLIANCE_IN_24_H_AFTER_DISMISSING_ANOTHER_ONE); return false; @@ -2317,7 +2316,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2411,12 +2410,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2468,7 +2467,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_IS_DISBANDED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2495,7 +2494,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 6deb410a0b..f252def55a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index c6a359d343..e8e00fb9ba 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 6d893c11e6..2fd8f5e328 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -563,7 +562,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -573,7 +572,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -590,7 +589,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index a0fd889952..842d385a19 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/instance/Item.java index d3d195d079..3a6216acbe 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -204,7 +203,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -227,7 +226,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1576,7 +1575,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1855,7 +1854,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2509,7 +2508,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index d51a9b03d2..92bd38e180 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 6a3523aceb..0d9104ee74 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 55574f19c8..620232aff3 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 5b1773f5d8..aebeb46ec7 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 22074f54c9..a37f196024 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -300,7 +299,7 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (endtime > Chronos.currentTimeMillis()) + if (endtime > System.currentTimeMillis()) { ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } @@ -335,7 +334,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 2fb931a64c..a596f81eca 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Castle.java index 210c516669..729c5dcb38 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java index 8618a787ae..c53db37e26 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 548befc4da..c3511dae34 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 6ba2c80c6b..b9e6eab661 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 8880336ce1..e3c6f5c1af 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -547,7 +546,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_ARE_DISMISSED_FROM_A_CLAN_YOU_CANNOT_JOIN_ANOTHER_FOR_24_H); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 271cf4fac6..58f01890be 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -130,7 +129,7 @@ public class RequestEnchantItem implements IClientIncomingPacket // fast auto-enchant cheat check // Lowered value to 500 (from 2000) On Essence, some enchantments are much faster than normal ones. - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 500)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 500)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index ae1ce1bebe..1c6df952cc 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -83,7 +82,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index f053f92a03..64d9bcd359 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index b0316c2a16..3d5ac76a53 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 1589ff8175..ed8b71ad6d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -78,7 +77,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket } return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 73c7d4aa2c..479f357641 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index d8d4b53eb5..a8fdda6dd1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(player.getName()); @@ -124,7 +123,7 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP // This activates the clan tab on the new member. PledgeShowMemberListAll.sendAllTo(player); player.setClanJoinExpiryTime(0); - player.setClanJoinTime(Chronos.currentTimeMillis()); + player.setClanJoinTime(System.currentTimeMillis()); player.broadcastUserInfo(); ClanEntryManager.getInstance().removePlayerApplication(_clanId, player.getObjectId()); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 1999f01379..591f38d131 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -105,7 +104,7 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket // This activates the clan tab on the new member. PledgeShowMemberListAll.sendAllTo(target); target.setClanJoinExpiryTime(0); - player.setClanJoinTime(Chronos.currentTimeMillis()); + player.setClanJoinTime(System.currentTimeMillis()); target.broadcastUserInfo(); ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 356308bbbd..29e525f1b0 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 743f92515d..7ff8b8c71b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 95ca234046..2c12de214e 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -288,7 +287,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 4d2e52f08a..b2aa5d3834 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -109,7 +108,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final int instanceId = holder.getInstanceId(); if ((instanceId > 0) && holder.isSoloInstance()) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index e4ad042344..f400170476 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -107,8 +107,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket /* * if ((mentor == null) || (mentee == null)) { return false; } else if (!mentee.isOnline()) { mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); return false; } else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { - * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) { long remainingTime = - * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int + * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { long remainingTime = + * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int * minutes = (int) (remainingTime / 60); final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_BOND_WITH_A_NEW_MENTEE_IN_S1_DAY_S_S2_HOUR_S_S3_MINUTE_S); msg.addInt(days); msg.addInt(hours); msg.addInt(minutes); mentor.sendPacket(msg); return false; } else if * (mentor.getObjectId() == mentee.getObjectId()) { mentor.sendPacket(SystemMessageId.YOU_CANNOT_BECOME_YOUR_OWN_MENTEE); return false; } else if (mentee.getLevel() >= 86) { mentor.sendPacket(new * SystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) { mentor.sendPacket(SystemMessageId.INVITATION_CAN_OCCUR_ONLY_WHEN_THE_MENTEE_IS_IN_MAIN_CLASS_STATUS); return false; } // else diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index e6cd27430c..780cc168fe 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -4,7 +4,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -183,7 +182,7 @@ public class ExPetEquipItem implements IClientIncomingPacket { Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null); pet.useEquippableItem(transferedItem, false); - }, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + }, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java index e0975d5bb7..5bd8eb9386 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV3; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -90,7 +89,7 @@ public class RequestExPledgeEnemyRegister implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); client.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java index c1b9bfc2c1..1aa48d30b1 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgedonation; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -50,6 +49,6 @@ public class RequestExPledgeDonationInfo implements IClientIncomingPacket return; } - player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (player.getClanJoinTime() + 86400000) < Chronos.currentTimeMillis())); + player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (player.getClanJoinTime() + 86400000) < System.currentTimeMillis())); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 65fb6e4413..0dea0570f4 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -139,7 +138,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java index 03e69980fa..3aa9e905a0 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.teleports; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.data.xml.RaidTeleportListData; import org.l2jmobius.gameserver.enums.RaidBossStatus; @@ -121,9 +120,9 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket } final int price; - if ((Chronos.currentTimeMillis() - player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) > 86400000) + if ((System.currentTimeMillis() - player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) > 86400000) { - player.getVariables().set("LastFreeRaidTeleportTime", Chronos.currentTimeMillis()); + player.getVariables().set("LastFreeRaidTeleportTime", System.currentTimeMillis()); price = 0; } else diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 499a4b492c..2ddadcbdc2 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -230,7 +229,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -321,7 +320,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 57acfedd38..0e816bc6b4 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 96224b45ff..36d05e9317 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index ae6d0f7aad..21e90a66ea 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -95,7 +94,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -115,7 +114,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -130,7 +129,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 21e417bf00..32c5d08d8c 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java index de282361d9..70f268a934 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/areas/Hellbound/IvoryTowerTeleportZones.java @@ -19,7 +19,6 @@ package ai.areas.Hellbound; import java.util.Calendar; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.zone.ZoneType; @@ -65,7 +64,7 @@ public class IvoryTowerTeleportZones extends AbstractNpcAI { disableZones(); } - }, (calendar.getTimeInMillis() + 86400000) - Chronos.currentTimeMillis(), 86400000); // Check every 24 hours. + }, (calendar.getTimeInMillis() + 86400000) - System.currentTimeMillis(), 86400000); // Check every 24 hours. } private void enableZones() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java index 567e8b2334..86b549221f 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/areas/OrcBarracks/Tarba/Tarba.java @@ -16,7 +16,6 @@ */ package ai.areas.OrcBarracks.Tarba; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; @@ -47,7 +46,7 @@ public class Tarba extends AbstractNpcAI { if (event.equals("teleport")) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if ((npc.getId() == TARBA) && ((player.getVariables().getLong(TARBA_TIME_VAR, 0) + 86400000) < currentTime)) { player.getVariables().set(TARBA_TIME_VAR, currentTime); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java index 546df502f0..e6f9dc42cc 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.MountType; @@ -170,14 +169,14 @@ public class Antharas extends AbstractNpcAI _antharas = (GrandBoss) addSpawn(ANTHARAS, loc_x, loc_y, loc_z, heading, false, 0); _antharas.setCurrentHpMp(curr_hp, curr_mp); addBoss(_antharas); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("CHECK_ATTACK", 60000, _antharas, null); startQuestTimer("SPAWN_MINION", 300000, _antharas, null); break; } case DEAD: { - final long remain = respawnTime - Chronos.currentTimeMillis(); + final long remain = respawnTime - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -273,7 +272,7 @@ public class Antharas extends AbstractNpcAI _antharas.setRandomWalking(false); _antharas.teleToLocation(181323, 114850, -7623, 32542); setStatus(IN_FIGHT); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); zone.broadcastPacket(new PlaySound("BS02_A")); startQuestTimer("CAMERA_1", 23, _antharas, null); break; @@ -368,7 +367,7 @@ public class Antharas extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 900000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 900000) < System.currentTimeMillis())) { setStatus(ALIVE); for (Creature creature : zone.getCharactersInside()) @@ -620,7 +619,7 @@ public class Antharas extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BOMBER) { if (npc.calculateDistance3D(attacker) < 230) @@ -766,7 +765,7 @@ public class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(Player attacker, int damage) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Baium/Baium.java index e105761319..2c851b0828 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Baium/Baium.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Baium/Baium.java @@ -17,7 +17,6 @@ package ai.bosses.Baium; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.CategoryType; @@ -137,7 +136,7 @@ public class Baium extends AbstractNpcAI final int heading = info.getInt("heading"); _baium = (GrandBoss) addSpawn(BAIUM, loc_x, loc_y, loc_z, heading, false, 0); _baium.setCurrentHpMp(curr_hp, curr_mp); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); addBoss(_baium); for (Location loc : ARCHANGEL_LOC) @@ -150,7 +149,7 @@ public class Baium extends AbstractNpcAI } case DEAD: { - final long remain = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long remain = info.getLong("respawn_time") - System.currentTimeMillis(); if (remain > 0) { startQuestTimer("CLEAR_STATUS", remain, null, null); @@ -210,7 +209,7 @@ public class Baium extends AbstractNpcAI _baium.disableCoreAI(true); _baium.setRandomWalking(false); addBoss(_baium); - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); startQuestTimer("WAKEUP_ACTION", 50, _baium, null); startQuestTimer("MANAGE_EARTHQUAKE", 2000, _baium, player); startQuestTimer("CHECK_ATTACK", 60000, _baium, null); @@ -376,7 +375,7 @@ public class Baium extends AbstractNpcAI } case "CHECK_ATTACK": { - if ((npc != null) && ((_lastAttack + 1800000) < Chronos.currentTimeMillis())) + if ((npc != null) && ((_lastAttack + 1800000) < System.currentTimeMillis())) { notifyEvent("CLEAR_ZONE", null, null); addSpawn(BAIUM_STONE, BAIUM_LOC, false, 0); @@ -384,7 +383,7 @@ public class Baium extends AbstractNpcAI } else if (npc != null) { - if (((_lastAttack + 300000) < Chronos.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) + if (((_lastAttack + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75))) { npc.setTarget(npc); npc.doCast(HEAL_OF_BAIUM.getSkill()); @@ -485,7 +484,7 @@ public class Baium extends AbstractNpcAI @Override public String onAttack(Npc npc, Player attacker, int damage, boolean isSummon, Skill skill) { - _lastAttack = Chronos.currentTimeMillis(); + _lastAttack = System.currentTimeMillis(); if (npc.getId() == BAIUM) { if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill())) @@ -665,7 +664,7 @@ public class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (Chronos.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); } private void manageSkills(Npc npc) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Core/Core.java index 4965abc89b..ddb6b20c93 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Core/Core.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Core/Core.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -87,7 +86,7 @@ public class Core extends AbstractNpcAI if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { // Load the unlock date and time for Core from DB. - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // If Core is locked until a certain time, mark it so and start the unlock timer the unlock time has not yet expired. if (temp > 0) { @@ -203,7 +202,7 @@ public class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // Also save the respawn time so that the info is maintained past reboots. final StatSet info = GrandBossManager.getInstance().getStatSet(CORE); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java index 5f2475fd42..03cd485ffd 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; @@ -98,7 +97,7 @@ public class Orfen extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for Orfen from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if Orfen is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -329,7 +328,7 @@ public class Orfen extends AbstractNpcAI startQuestTimer("orfen_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ORFEN, info); cancelQuestTimer("check_minion_loc", npc, null); cancelQuestTimer("check_orfen_pos", npc, null); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java index b43519c005..6c23250016 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; @@ -97,7 +96,7 @@ public class QueenAnt extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for queen ant from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); // if queen ant is locked until a certain time, mark it so and start the unlock timer // the unlock time has not yet expired. if (temp > 0) @@ -368,7 +367,7 @@ public class QueenAnt extends AbstractNpcAI cancelQuestTimer("heal", null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(QUEEN, info); _nurses.clear(); if (_larva != null) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java index ee8eb3ba2f..9214fdb028 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java @@ -17,7 +17,6 @@ package ai.bosses.Zaken; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -55,7 +54,7 @@ public class Zaken extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time from DB - final long temp = info.getLong("respawn_time") - Chronos.currentTimeMillis(); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("zaken_unlock", temp, null, null); @@ -99,7 +98,7 @@ public class Zaken extends AbstractNpcAI startQuestTimer("zaken_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN); - info.set("respawn_time", Chronos.currentTimeMillis() + respawnTime); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatSet(ZAKEN, info); return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java index 6870955ced..05751de2da 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/ClanHallAuctioneer/ClanHallAuctioneer.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.instancemanager.ClanHallAuctionManager; import org.l2jmobius.gameserver.model.actor.Npc; @@ -156,7 +155,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI htmltext = htmltext.replace("%id%", String.valueOf(clanHallAuction.getClanHallId())); htmltext = htmltext.replace("%minBid%", String.valueOf(clanHallAuction.getHighestBid())); htmltext = htmltext.replace("%myBid%", String.valueOf(clanHallAuction.getClanBid(clan))); - htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + htmltext = htmltext.replace("%auctionEnd%", builder.appendPattern("dd/MM/yyyy HH").appendLiteral(" hour ").appendPattern("mm").appendLiteral(" minutes").toFormatter().format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); } } else @@ -192,7 +191,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHall clanHall = ClanHallData.getInstance().getClanHallById(clanHallAuction.getClanHallId()); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); htmltext = getHtm(player, "ClanHallAuctioneer-bidInfo.html"); @@ -250,7 +249,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI final ClanHallAuction clanHallAuction = ClanHallAuctionManager.getInstance().getClanHallAuctionById(clanHallId); final Clan owner = clanHall.getOwner(); final long remainingTime = ClanHallAuctionManager.getInstance().getRemainingTime(); - final Instant endTime = Instant.ofEpochMilli(Chronos.currentTimeMillis() + remainingTime); + final Instant endTime = Instant.ofEpochMilli(System.currentTimeMillis() + remainingTime); final DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder(); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(getHtm(player, "ClanHallAuctioneer-info.html")); @@ -299,7 +298,7 @@ public class ClanHallAuctioneer extends AbstractNpcAI sb.append("\">&%"); sb.append(clanHall.getResidenceId()); sb.append(";[0]"); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java index a121435894..ea0a8a16da 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/ProvisionalHalls/ProvisionalHalls.java @@ -21,7 +21,6 @@ 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; @@ -74,7 +73,7 @@ public class ProvisionalHalls extends AbstractNpcAI if (resetTime > 0) { cancelQuestTimers(HALL_RESET_VAR + id); - startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (Chronos.currentTimeMillis() - resetTime) - 30000)), null, null); + startQuestTimer(HALL_RESET_VAR + id, Math.max(1000, (TWO_WEEKS - (System.currentTimeMillis() - resetTime) - 30000)), null, null); } } } @@ -127,7 +126,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) < Chronos.currentTimeMillis())) + if ((GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0) == 0) && ((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) < System.currentTimeMillis())) { player.reduceAdena("ProvisionalHall", HALL_PRICE, player, true); GlobalVariablesManager.getInstance().set(HALL_OWNER_VAR + id, player.getClanId()); @@ -138,7 +137,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 - (Chronos.currentTimeMillis() - calendar.getTimeInMillis()), null, null); + startQuestTimer("RESET_ORCHID_HALL", TWO_WEEKS - (System.currentTimeMillis() - calendar.getTimeInMillis()), null, null); return null; } } @@ -178,7 +177,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) <= Chronos.currentTimeMillis()) + if (((GlobalVariablesManager.getInstance().getLong(HALL_TIME_VAR + id, 0) + TWO_WEEKS) - 60000) <= System.currentTimeMillis()) { final int clanId = GlobalVariablesManager.getInstance().getInt(HALL_OWNER_VAR + id, 0); if (clanId > 0) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java index d663b59d41..13511ba463 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java @@ -140,7 +140,7 @@ public class TvT extends Event // calendar.set(Calendar.HOUR_OF_DAY, 20); // calendar.set(Calendar.MINUTE, 0); // calendar.set(Calendar.SECOND, 0); - // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - Chronos.currentTimeMillis(), 86400000); // 86400000 = 1 day + // ThreadPool.scheduleAtFixedRate(() -> eventStart(null), calendar.getTimeInMillis() - System.currentTimeMillis(), 86400000); // 86400000 = 1 day } @Override diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java index 20d9eeacde..0e8a9686d7 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/events/BlossomFestival/BlossomFestival.java @@ -16,7 +16,6 @@ */ package events.BlossomFestival; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; @@ -60,7 +59,7 @@ public class BlossomFestival extends LongTimeEvent synchronized (REWARD_LOCK) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (player.getVariables().getLong(REWARD_VAR, 0) < currentTime) { player.getVariables().set(REWARD_VAR, currentTime + 86400000); // 24 hours diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/events/HappyHours/HappyHours.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/events/HappyHours/HappyHours.java index 09a6f9aebc..e76af2108a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/events/HappyHours/HappyHours.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/events/HappyHours/HappyHours.java @@ -16,7 +16,6 @@ */ 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.Player; @@ -40,7 +39,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 = Chronos.currentTimeMillis(); + private static long _lastRewardTime = System.currentTimeMillis(); private HappyHours() { @@ -77,9 +76,9 @@ public class HappyHours extends LongTimeEvent { if (isEventPeriod()) { - if ((Chronos.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. + if ((System.currentTimeMillis() - (_lastRewardTime + REWARD_INTERVAL)) > 0) // Exploit check - Just in case. { - _lastRewardTime = Chronos.currentTimeMillis(); + _lastRewardTime = System.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_SIBI_S_COINS); systemMsg.addInt(20); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java index c1142d2eb2..c2784bfebb 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java @@ -19,7 +19,6 @@ 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; @@ -210,7 +209,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler { activeChar.addItem("AdminCursedWeaponAdd", id, 1, activeChar, true); } - cw.setEndTime(Chronos.currentTimeMillis() + (cw.getDuration() * 60000)); + cw.setEndTime(System.currentTimeMillis() + (cw.getDuration() * 60000)); cw.reActivate(); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java index a7fcd99ef4..7d65d0b070 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java @@ -19,7 +19,6 @@ 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.Player; @@ -67,7 +66,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler if (GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange() > 0) { final Calendar nextChangeDate = Calendar.getInstance(); - nextChangeDate.setTimeInMillis(Chronos.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); + nextChangeDate.setTimeInMillis(System.currentTimeMillis() + GraciaSeedsManager.getInstance().getSoDTimeForNextStateChange()); html.replace("%sodtime%", nextChangeDate.getTime().toString()); } else diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java index 0b17e6480f..15ad8645b2 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java @@ -20,7 +20,6 @@ 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 +117,7 @@ public class AdminInstanceZone implements IAdminCommandHandler int hours = 0; int minutes = 0; final int id = entry.getKey(); - final long remainingTime = (entry.getValue() - Chronos.currentTimeMillis()) / 1000; + final long remainingTime = (entry.getValue() - System.currentTimeMillis()) / 1000; if (remainingTime > 0) { hours = (int) (remainingTime / 3600); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index 444039c554..94d093f7fa 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -24,7 +24,6 @@ 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; @@ -237,7 +236,7 @@ public class AdminPunishment implements IAdminCommandHandler long expirationTime = Integer.parseInt(exp); if (expirationTime > 0) { - expirationTime = Chronos.currentTimeMillis() + (expirationTime * 60 * 1000); + expirationTime = System.currentTimeMillis() + (expirationTime * 60 * 1000); } final PunishmentAffect affect = PunishmentAffect.getByName(af); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java index 31e500e749..ddd3ef6a14 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java @@ -29,7 +29,6 @@ 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.cache.HtmCache; import org.l2jmobius.gameserver.data.xml.AdminData; @@ -74,7 +73,7 @@ public class AdminServerInfo implements IAdminCommandHandler html.replace("%gameTime%", GameTimeTaskManager.getInstance().getGameHour() + ":" + GameTimeTaskManager.getInstance().getGameMinute()); html.replace("%dayNight%", GameTimeTaskManager.getInstance().isNight() ? "Night" : "Day"); html.replace("%geodata%", Config.PATHFINDING ? "Enabled" : "Disabled"); - html.replace("%serverTime%", SDF.format(new Date(Chronos.currentTimeMillis()))); + html.replace("%serverTime%", SDF.format(new Date(System.currentTimeMillis()))); html.replace("%serverUpTime%", getServerUpTime()); html.replace("%onlineAll%", getPlayersCount("ALL")); html.replace("%offlineTrade%", getPlayersCount("OFF_TRADE")); @@ -101,7 +100,7 @@ public class AdminServerInfo implements IAdminCommandHandler private String getServerUpTime() { - long time = Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); + long time = System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis(); final long days = TimeUnit.MILLISECONDS.toDays(time); time -= TimeUnit.DAYS.toMillis(days); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index 90fec8404c..a45a8f51b9 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -21,7 +21,6 @@ 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; @@ -134,7 +133,7 @@ public class FindPvP implements IBypassHandler player.setSpawnProtection(true); if (!player.isGM()) { - player.setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + player.setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); player.startPvPFlag(); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java index 2c6b5a232e..84462adcb8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -62,9 +61,9 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler final long lastCompleted = entry.getLastCompleted(); if (lastCompleted == 0) // Initial entry. { - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); } - else if ((Chronos.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. + else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java index ba68e05a9e..f7e5360c4e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java @@ -18,7 +18,6 @@ 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; @@ -64,7 +63,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) || ((Chronos.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. + && ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay. { entry.setProgress(1); entry.setStatus(DailyMissionStatus.AVAILABLE); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index 0dc80a8c13..e49103f8b7 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -64,7 +63,7 @@ public class AddHuntingTime extends AbstractEffect return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final long endTime = currentTime + player.getTimedHuntingZoneRemainingTime(_zoneId); if ((endTime > currentTime) && (((endTime - currentTime) + _time) >= holder.getMaximumAddedTime())) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java index 6290b10835..0bcd2b11ca 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java @@ -16,7 +16,6 @@ */ package handlers.effecthandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; @@ -53,19 +52,19 @@ public class SayhaGraceSupport extends AbstractEffect final double rnd = Rnd.nextDouble() * 100; if (rnd <= 0.1) // 4h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 4)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 4)); } else if (rnd <= 0.3) // 3h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 3)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 3)); } else if (rnd <= 0.6) // 2h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 2)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 2)); } else if (rnd <= 1.1) // 1h { - player.setSayhaGraceSupportEndTime(Chronos.currentTimeMillis() + (3600000 * 1)); + player.setSayhaGraceSupportEndTime(System.currentTimeMillis() + (3600000 * 1)); } } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java index 40cb212cfd..ac0888bbb2 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java @@ -16,7 +16,6 @@ */ package handlers.itemhandlers; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class LimitedSayha implements IItemHandler break; } } - if ((time > 0) && player.setLimitedSayhaGraceEndTime(Chronos.currentTimeMillis() + time)) + if ((time > 0) && player.setLimitedSayhaGraceEndTime(System.currentTimeMillis() + time)) { player.destroyItem("LimitedSayha potion", item, 1, player, true); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8b601d07eb..3edab38faf 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -16,7 +16,6 @@ */ 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; @@ -153,7 +152,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private void applyToPlayer(PunishmentTask task, Player player) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.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_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 0a436e9f79..21ae7e3c6e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -17,7 +17,6 @@ package handlers.punishmenthandlers; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IPunishmentHandler; @@ -207,7 +206,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = (task.getExpirationTime() - Chronos.currentTimeMillis()) / 1000; + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java index fd92c92ed9..3dd1cdc97d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/Ban.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Ban implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java index 85b92a163b..f653561c0d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/BanChat.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class BanChat implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java index c21718ad0c..cf3736fc0e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/telnethandlers/player/Jail.java @@ -16,7 +16,6 @@ */ 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; @@ -66,7 +65,7 @@ public class Jail implements ITelnetCommand if (Util.isDigit(token)) { time = Integer.parseInt(token) * 60 * 1000; - time += Chronos.currentTimeMillis(); + time += System.currentTimeMillis(); } if (args.length > 2) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java index 8c45abbd60..7acff5d97a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java @@ -18,7 +18,6 @@ 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.Player; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; @@ -47,7 +46,7 @@ public class ClanPenalty implements IUserCommandHandler final StringBuilder htmlContent = new StringBuilder(500); htmlContent.append("
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
"); - sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(Chronos.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); + sb.append(DateTimeFormatter.ofPattern("dd/MM/yyyy").format(Instant.ofEpochMilli(System.currentTimeMillis() + ClanHallAuctionManager.getInstance().getRemainingTime()).atZone(ZoneId.systemDefault()))); sb.append(""); sb.append(auction.getHighestBid()); sb.append("
PenaltyExpiration Date
"); - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { htmlContent.append(""); html.append(""); html.append(""); - html.append(""); + html.append(""); html.append(""); html.append(""); html.append(""); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java index 9aa1b17dde..c1334f906a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/instances/LastImperialTomb/ScarletVanHalisha.java @@ -23,7 +23,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; @@ -144,11 +143,11 @@ public class ScarletVanHalisha extends AbstractNpcAI { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_CHARGE, 2); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_FIELD, 1); } - else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < Chronos.currentTimeMillis()) && (getRandom(100) < 10)) + else if (((_lastRangedSkillTime + RANGED_SKILL_MIN_COOLTIME) < System.currentTimeMillis()) && (getRandom(100) < 10)) { return SkillData.getInstance().getSkill(FRINTEZZA_DAEMON_MORPH, 1); } @@ -249,7 +248,7 @@ public class ScarletVanHalisha extends AbstractNpcAI case FRINTEZZA_DAEMON_MORPH: case FRINTEZZA_DAEMON_FIELD: { - _lastRangedSkillTime = Chronos.currentTimeMillis(); + _lastRangedSkillTime = System.currentTimeMillis(); skillRange = 550; break; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/util/Chronos.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/util/Chronos.java deleted file mode 100644 index a4d15f77e5..0000000000 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/commons/util/Chronos.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2021 Pantelis Andrianakis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package org.l2jmobius.commons.util; - -/** - * Chronos updates an internal long value with System.currentTimeMillis() approximately every 1 millisecond.
- * To get the current time in milliseconds use Chronos.currentTimeMillis() - * @author Pantelis Andrianakis - * @version February 3rd 2021 - */ -public class Chronos extends Thread -{ - private long _currentTimeMillis = System.currentTimeMillis(); - - public Chronos() - { - super.setName("Chronos"); - super.setPriority(MAX_PRIORITY); - super.setDaemon(true); - super.start(); - } - - @Override - public void run() - { - while (true) - { - _currentTimeMillis = System.currentTimeMillis(); - - // Sleep for approximately 1 millisecond. - try - { - Thread.sleep(1); - } - catch (Exception e) - { - } - } - } - - /** - * Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.
- *
- * See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC). - * @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC. - */ - public static long currentTimeMillis() - { - return getInstance()._currentTimeMillis; - } - - public static Chronos getInstance() - { - return SingletonHolder.INSTANCE; - } - - private static class SingletonHolder - { - protected static final Chronos INSTANCE = new Chronos(); - } -} diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/GameServer.java index dc33e26261..d4dd118f1d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/GameServer.java @@ -32,7 +32,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.enums.ServerMode; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.DeadLockDetector; import org.l2jmobius.commons.util.PropertiesParser; import org.l2jmobius.gameserver.cache.HtmCache; @@ -200,7 +199,7 @@ public class GameServer public GameServer() throws Exception { - final long serverLoadStart = Chronos.currentTimeMillis(); + final long serverLoadStart = System.currentTimeMillis(); // GUI final PropertiesParser interfaceConfig = new PropertiesParser(Config.INTERFACE_CONFIG_FILE); @@ -500,7 +499,7 @@ public class GameServer final long totalMem = Runtime.getRuntime().maxMemory() / 1048576; LOGGER.info(getClass().getSimpleName() + ": Started, using " + getUsedMemoryMB() + " of " + totalMem + " MB total memory."); LOGGER.info(getClass().getSimpleName() + ": Maximum number of connected players is " + Config.MAXIMUM_ONLINE_USERS + "."); - LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((Chronos.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); + LOGGER.info(getClass().getSimpleName() + ": Server loaded in " + ((System.currentTimeMillis() - serverLoadStart) / 1000) + " seconds."); ClientNetworkManager.getInstance().start(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/Shutdown.java index b94448f112..d51e9c31bf 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/Shutdown.java @@ -23,7 +23,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseBackup; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.BotReportTable; import org.l2jmobius.gameserver.data.SchemeBufferTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -537,19 +536,19 @@ public class Shutdown extends Thread public void restartCounter() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); } public long getEstimatedTimeAndRestartCounter() { - final long toReturn = Chronos.currentTimeMillis() - _startTime; + final long toReturn = System.currentTimeMillis() - _startTime; restartCounter(); return toReturn; } public long getEstimatedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 8f7866d103..413931a2aa 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.instancemanager.WalkingManager; @@ -313,7 +312,7 @@ public class CreatureAI extends AbstractAI if (_actor.isAttackingNow()) { - ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(new CastTask(_actor, skill, target, item, forceUse, dontMove), _actor.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java index 2317e2d037..0d17397987 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/cache/WarehouseCacheManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -40,7 +39,7 @@ public class WarehouseCacheManager public void addCacheTask(Player pc) { - CACHED_WH.put(pc, Chronos.currentTimeMillis()); + CACHED_WH.put(pc, System.currentTimeMillis()); } public void remCacheTask(Player pc) @@ -57,7 +56,7 @@ public class WarehouseCacheManager @Override public void run() { - final long cTime = Chronos.currentTimeMillis(); + final long cTime = System.currentTimeMillis(); for (Entry entry : CACHED_WH.entrySet()) { if ((cTime - entry.getValue().longValue()) > CACHE_TIME) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java index d587355921..fc1c7cd3dc 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/BotReportTable.java @@ -39,7 +39,6 @@ import org.xml.sax.helpers.DefaultHandler; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; @@ -125,7 +124,7 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() < c.getTimeInMillis()) + if (System.currentTimeMillis() < c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1); } @@ -291,7 +290,7 @@ public class BotReportTable return false; } - final long reuse = (Chronos.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MIN_YOU_HAVE_S2_POINT_S_LEFT); @@ -302,7 +301,7 @@ public class BotReportTable } } - final long curTime = Chronos.currentTimeMillis(); + final long curTime = System.currentTimeMillis(); if (rcd == null) { rcd = new ReportedCharData(); @@ -419,12 +418,12 @@ public class BotReportTable final Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0])); c.set(Calendar.MINUTE, Integer.parseInt(hour[1])); - if (Chronos.currentTimeMillis() > c.getTimeInMillis()) + if (System.currentTimeMillis() > c.getTimeInMillis()) { c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1); } - ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - Chronos.currentTimeMillis()); + ThreadPool.schedule(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis()); } catch (Exception e) { @@ -465,7 +464,7 @@ public class BotReportTable { if (map.containsKey(objectId)) { - return (Chronos.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; + return (System.currentTimeMillis() - map.get(objectId)) > Config.BOTREPORT_REPORT_DELAY; } return true; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/ClanTable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/ClanTable.java index 7fe48b0a91..757dfa598e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/ClanTable.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/ClanTable.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.enums.ClanWarState; @@ -172,7 +171,7 @@ public class ClanTable player.sendPacket(SystemMessageId.FAILED_TO_CREATE_A_CLAN); return null; } - if (Chronos.currentTimeMillis() < player.getClanCreateExpiryTime()) + if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) { player.sendPacket(SystemMessageId.YOU_MUST_WAIT_10_DAYS_BEFORE_CREATING_A_NEW_CLAN); return null; @@ -347,7 +346,7 @@ public class ClanTable { destroyClan(clanId); } - }, Math.max(getClan(clanId).getDissolvingExpiryTime() - Chronos.currentTimeMillis(), 300000)); + }, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000)); } public boolean isAllyExists(String allyName) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java index f0e2cf82a3..e5153027f1 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/OfflineTraderTable.java @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.ManufactureItem; import org.l2jmobius.gameserver.model.TradeItem; @@ -185,7 +184,7 @@ public class OfflineTraderTable final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(time); cal.add(Calendar.DAY_OF_YEAR, Config.OFFLINE_MAX_DAYS); - if (cal.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (cal.getTimeInMillis() <= System.currentTimeMillis()) { continue; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java index c277a98581..8eca8293db 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.DailyMissionStatus; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry; @@ -108,7 +107,7 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); entry.setStatus(DailyMissionStatus.COMPLETED); - entry.setLastCompleted(Chronos.currentTimeMillis()); + entry.setLastCompleted(System.currentTimeMillis()); entry.setRecentlyCompleted(true); storePlayerEntry(entry); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index c9bd4ec11e..c022a91dc8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.enums.PlayerAction; import org.l2jmobius.gameserver.model.WorldObject; @@ -116,7 +115,7 @@ public class AdminCommandHandler implements IHandler { - final long begin = Chronos.currentTimeMillis(); + final long begin = System.currentTimeMillis(); try { if (Config.GMAUDIT) @@ -134,7 +133,7 @@ public class AdminCommandHandler implements IHandler 5000) { player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + "."); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java index ff6a5afde7..2a01fa9a01 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/AntiFeedManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; @@ -49,7 +48,7 @@ public class AntiFeedManager */ public void setLastDeathTime(int objectId) { - _lastDeathTimes.put(objectId, Chronos.currentTimeMillis()); + _lastDeathTimes.put(objectId, System.currentTimeMillis()); } /** @@ -82,7 +81,7 @@ public class AntiFeedManager return false; } - if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((Chronos.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) + if ((Config.ANTIFEED_INTERVAL > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId()) && ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < Config.ANTIFEED_INTERVAL)) { return false; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 6afd2b2102..0629d6ac70 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -42,7 +42,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ManorMode; @@ -278,7 +277,7 @@ public class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - Chronos.currentTimeMillis())); + ThreadPool.schedule(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); } public void changeMode() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 468067f403..6965a32b36 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.residences.ClanHallAuction; @@ -42,7 +41,7 @@ public class ClanHallAuctionManager protected ClanHallAuctionManager() { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Schedule of the start, next Wednesday at 19:00. final Calendar start = Calendar.getInstance(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 2ce3e815cc..5f3b8df714 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -35,7 +35,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.CursedWeapon; import org.l2jmobius.gameserver.model.actor.Attackable; @@ -314,7 +313,7 @@ public class CursedWeaponsManager implements IXmlReader final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_S2_MIN_OF_USAGE_TIME_REMAINING); sm.addString(cw.getName()); // sm.addItemName(cw.getItemId()); - sm.addInt((int) ((cw.getEndTime() - Chronos.currentTimeMillis()) / 60000)); + sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000)); player.sendPacket(sm); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index 205d211014..1a8ca676d3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -215,7 +214,7 @@ public class DBSpawnManager final int respawnMinDelay = (int) (npc.getSpawn().getRespawnMinDelay() * Config.RAID_MIN_RESPAWN_MULTIPLIER); final int respawnMaxDelay = (int) (npc.getSpawn().getRespawnMaxDelay() * Config.RAID_MAX_RESPAWN_MULTIPLIER); final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay); - final long respawnTime = Chronos.currentTimeMillis() + respawnDelay; + final long respawnTime = System.currentTimeMillis() + respawnDelay; info.set("currentHP", npc.getMaxHp()); info.set("currentMP", npc.getMaxMp()); info.set("respawnTime", respawnTime); @@ -257,7 +256,7 @@ public class DBSpawnManager } final int npcId = spawn.getId(); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SpawnTable.getInstance().addNewSpawn(spawn, false); if ((respawnTime == 0) || (time > respawnTime)) { @@ -279,7 +278,7 @@ public class DBSpawnManager } else { - final long spawnTime = respawnTime - Chronos.currentTimeMillis(); + final long spawnTime = respawnTime - System.currentTimeMillis(); _schedules.put(npcId, ThreadPool.schedule(() -> scheduleSpawn(npcId), spawnTime)); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java index ba237be662..2d27475d04 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DailyTaskManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.data.xml.LimitShopData; @@ -78,7 +77,7 @@ public class DailyTaskManager protected DailyTaskManager() { // Schedule reset everyday at 6:30. - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.HOUR_OF_DAY, 6); calendar.set(Calendar.MINUTE, 30); @@ -111,7 +110,7 @@ public class DailyTaskManager private void onReset() { // Store last reset time. - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.DAILY_TASK_RESET, System.currentTimeMillis()); // Wednesday weekly tasks. if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.WEDNESDAY) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index c2bab7af23..c08436b1d1 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -21,7 +21,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.tasks.UpdateSoDStateTask; import org.l2jmobius.gameserver.model.quest.Quest; @@ -105,7 +104,7 @@ public class GraciaSeedsManager case 2: { // Conquest Complete state, if too much time is passed than change to defense state - final long timePast = Chronos.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); + final long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis(); if (timePast >= Config.SOD_STAGE_2_LENGTH) { // change to Attack state because Defend statet is not implemented @@ -173,7 +172,7 @@ public class GraciaSeedsManager public void setSoDState(int value, boolean doSave) { LOGGER.info(getClass().getSimpleName() + ": New Seed of Destruction state -> " + value + "."); - _SoDLastStateChangeDate.setTimeInMillis(Chronos.currentTimeMillis()); + _SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis()); _SoDState = value; // reset number of Tiat kills if (_SoDState == 1) @@ -199,7 +198,7 @@ public class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - Chronos.currentTimeMillis()); + return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); } case 3: { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/IdManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/IdManager.java index 161e558dd1..e44b841741 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/IdManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/IdManager.java @@ -30,7 +30,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.util.PrimeFinder; /** @@ -86,7 +85,7 @@ public class IdManager try (Connection con = DatabaseFactory.getConnection(); Statement statement = con.createStatement()) { - final long cleanupStart = Chronos.currentTimeMillis(); + final long cleanupStart = System.currentTimeMillis(); int cleanCount = 0; // Characters @@ -158,7 +157,7 @@ public class IdManager statement.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);"); statement.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);"); - LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((Chronos.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); + LOGGER.info("IdManager: Cleaned " + cleanCount + " elements from database in " + ((System.currentTimeMillis() - cleanupStart) / 1000) + " seconds."); } catch (Exception e) { @@ -174,7 +173,7 @@ public class IdManager { try (PreparedStatement statement = con.prepareStatement(line)) { - statement.setLong(1, Chronos.currentTimeMillis()); + statement.setLong(1, System.currentTimeMillis()); cleanCount += statement.executeUpdate(); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java index 123042a55d..88cbfb4fd0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -40,7 +40,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.data.xml.SpawnData; @@ -525,7 +524,7 @@ public class InstanceManager implements IXmlReader { // Check if instance penalty passed final long time = rs.getLong("time"); - if (time > Chronos.currentTimeMillis()) + if (time > System.currentTimeMillis()) { // Load params final int charId = rs.getInt("charId"); @@ -560,7 +559,7 @@ public class InstanceManager implements IXmlReader final List invalidPenalty = new ArrayList<>(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - if (entry.getValue() <= Chronos.currentTimeMillis()) + if (entry.getValue() <= System.currentTimeMillis()) { invalidPenalty.add(entry.getKey()); } @@ -619,7 +618,7 @@ public class InstanceManager implements IXmlReader // If reenter time is higher then current, delete it final long time = playerData.get(id); - if (time <= Chronos.currentTimeMillis()) + if (time <= System.currentTimeMillis()) { deleteInstanceTime(player, id); return -1; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 457d7c751e..babb954583 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; @@ -84,7 +83,7 @@ public class ItemsOnGroundManager implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(str)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.execute(); } catch (Exception e) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java index 36d6048345..596c9d4687 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/MentorManager.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Mentee; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -146,7 +145,7 @@ public class MentorManager { final Player player = World.getInstance().getPlayer(mentorId); final PlayerVariables vars = player != null ? player.getVariables() : new PlayerVariables(mentorId); - vars.set("Mentor-Penalty-" + mentorId, String.valueOf(Chronos.currentTimeMillis() + penalty)); + vars.set("Mentor-Penalty-" + mentorId, String.valueOf(System.currentTimeMillis() + penalty)); } public long getMentorPenalty(int mentorId) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java index 5a97cdff20..83571c6dda 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.Containers; @@ -80,7 +79,7 @@ public class PremiumManager final Player player = event.getPlayer(); final String accountName = player.getAccountName(); loadPremiumData(accountName); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); final long premiumExpiration = getPremiumExpiration(accountName); player.setPremiumStatus(premiumExpiration > now); if (player.hasPremiumStatus()) @@ -154,7 +153,7 @@ public class PremiumManager public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit) { final long addTime = timeUnit.toMillis(timeValue); - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); // new premium task at least from now final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName)); final long newPremiumExpiration = oldPremiumExpiration + addTime; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 08193f9c5b..9617f26e43 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.holders.PunishmentHolder; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; @@ -72,7 +71,7 @@ public class PunishmentManager final String punishedBy = rset.getString("punishedBy"); if ((type != null) && (affect != null)) { - if ((expirationTime > 0) && (Chronos.currentTimeMillis() > expirationTime)) // expired task. + if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task. { expired++; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java index 05038a2fe8..d25616e102 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/PurgeRankingManager.java @@ -31,7 +31,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; @@ -70,9 +69,9 @@ public class PurgeRankingManager { // Weekly rewards. final long lastPurgeRewards = GlobalVariablesManager.getInstance().getLong(GlobalVariablesManager.PURGE_REWARD_TIME, 0); - if ((Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) && ((Chronos.currentTimeMillis() - lastPurgeRewards) > (604800000 /* 1 week */ - 600000 /* task delay x2 */))) + if ((Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) && ((System.currentTimeMillis() - lastPurgeRewards) > (604800000 /* 1 week */ - 600000 /* task delay x2 */))) { - GlobalVariablesManager.getInstance().set(GlobalVariablesManager.PURGE_REWARD_TIME, Chronos.currentTimeMillis()); + GlobalVariablesManager.getInstance().set(GlobalVariablesManager.PURGE_REWARD_TIME, System.currentTimeMillis()); for (int category = 1; category <= 7; category++) { if (getTop5(category) != null) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/RankManager.java index 681e2bb219..bdb6d2a7b4 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/RankManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/RankManager.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.PetDataTable; import org.l2jmobius.gameserver.model.StatSet; @@ -42,7 +41,7 @@ public class RankManager private static final Logger LOGGER = Logger.getLogger(RankManager.class.getName()); public static final Long TIME_LIMIT = 2592000000L; // 30 days in milliseconds - public static final long CURRENT_TIME = Chronos.currentTimeMillis(); + public static final long CURRENT_TIME = System.currentTimeMillis(); public static final int PLAYER_LIMIT = 500; private static final String SELECT_CHARACTERS = "SELECT charId,char_name,level,race,base_class, clanid FROM characters WHERE (" + CURRENT_TIME + " - cast(lastAccess as signed) < " + TIME_LIMIT + ") AND accesslevel = 0 AND level > 39 ORDER BY exp DESC, onlinetime DESC LIMIT " + PLAYER_LIMIT; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index 7a4f43686f..dbe4969dba 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.xml.NpcData; @@ -425,7 +424,7 @@ public class BlockChecker // Start up player parameters setUpPlayers(); // Set the started time - _startedTime = Chronos.currentTimeMillis() + 300000; + _startedTime = System.currentTimeMillis() + 300000; } } @@ -525,7 +524,7 @@ public class BlockChecker _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - final int timeLeft = (int) ((_startedTime - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((_startedTime - System.currentTimeMillis()) / 1000); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints()); _holder.broadCastPacketToTeam(changePoints); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CursedWeapon.java index c9cf45a6b9..7947edf57e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.enums.PartyMessageType; @@ -200,7 +199,7 @@ public class CursedWeapon implements INamable @Override public void run() { - if (Chronos.currentTimeMillis() >= _endTime) + if (System.currentTimeMillis() >= _endTime) { endOfLife(); } @@ -329,7 +328,7 @@ public class CursedWeapon implements INamable public void reActivate() { _isActivated = true; - if ((_endTime - Chronos.currentTimeMillis()) <= 0) + if ((_endTime - System.currentTimeMillis()) <= 0) { endOfLife(); } @@ -347,7 +346,7 @@ public class CursedWeapon implements INamable dropIt(attackable, player); // Start the Life Task - _endTime = Chronos.currentTimeMillis() + (_duration * 60000); + _endTime = System.currentTimeMillis() + (_duration * 60000); _removeTask = ThreadPool.scheduleAtFixedRate(new RemoveTask(), _durationLost * 12000, _durationLost * 12000); return true; } @@ -631,7 +630,7 @@ public class CursedWeapon implements INamable public long getTimeLeft() { - return _endTime - Chronos.currentTimeMillis(); + return _endTime - System.currentTimeMillis(); } public void goTo(Player player) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ItemInfo.java index 17b7e2334b..7dd79abc08 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Objects; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.buylist.Product; @@ -157,7 +156,7 @@ public class ItemInfo _soulCrystalOptions = item.getSpecialAbilities(); _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); _visualId = item.getVisualId(); - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; _reuseDelay = item.getReuseDelay(); _owner = item.getActingPlayer(); } @@ -166,7 +165,7 @@ public class ItemInfo { this(item); _change = change; - _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - Chronos.currentTimeMillis()) / 1000 : 0; + _visualExpiration = item.getVisualLifeTime() > 0 ? (item.getVisualLifeTime() - System.currentTimeMillis()) / 1000 : 0; } public ItemInfo(TradeItem item) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Message.java index 2cb7e77ecf..443020fc92 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Message.java @@ -21,7 +21,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; @@ -105,7 +104,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? Chronos.currentTimeMillis() + (COD_EXPIRATION * 3600000) : Chronos.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -124,7 +123,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _reqAdena = 0; _hasAttachments = false; _unread = true; @@ -144,7 +143,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = content; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = true; @@ -163,7 +162,7 @@ public class Message _receiverId = msg.getSenderId(); _subject = ""; _content = ""; - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _deletedByReceiver = false; @@ -183,7 +182,7 @@ public class Message _receiverId = receiverId; _subject = ""; _content = item.getName(); - _expiration = Chronos.currentTimeMillis() + (EXPIRATION * 3600000); + _expiration = System.currentTimeMillis() + (EXPIRATION * 3600000); _unread = true; _deletedBySender = true; _messageType = mailType; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Petition.java index 49e613a3fc..d6f2dbf32e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Petition.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Petition.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PetitionState; import org.l2jmobius.gameserver.enums.PetitionType; import org.l2jmobius.gameserver.instancemanager.IdManager; @@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; */ public class Petition { - private final long _submitTime = Chronos.currentTimeMillis(); + private final long _submitTime = System.currentTimeMillis(); private final int _id; private final PetitionType _type; private PetitionState _state = PetitionState.PENDING; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Spawn.java index b494a7bd6b..7e5e0bc113 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Spawn.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/Spawn.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -260,7 +259,7 @@ public class Spawn extends Location implements IIdentifiable, INamable _scheduledCount++; // Schedule the next respawn. - RespawnTaskManager.getInstance().add(oldNpc, Chronos.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); + RespawnTaskManager.getInstance().add(oldNpc, System.currentTimeMillis() + (hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay)); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/TimeStamp.java index c9c44081a2..c1364e3e14 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skill.Skill; @@ -53,7 +52,7 @@ public class TimeStamp _id2 = skill.getLevel(); _id3 = skill.getSubLevel(); _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = -1; } @@ -69,7 +68,7 @@ public class TimeStamp _id2 = item.getObjectId(); _id3 = 0; _reuse = reuse; - _stamp = systime > 0 ? systime : reuse != 0 ? Chronos.currentTimeMillis() + reuse : 0; + _stamp = systime > 0 ? systime : reuse != 0 ? System.currentTimeMillis() + reuse : 0; _group = item.getSharedReuseGroup(); } @@ -156,7 +155,7 @@ public class TimeStamp { return 0; } - final long remainingTime = Math.max(_stamp - Chronos.currentTimeMillis(), 0); + final long remainingTime = Math.max(_stamp - System.currentTimeMillis(), 0); if (remainingTime == 0) { _stamp = 0; @@ -174,7 +173,7 @@ public class TimeStamp { return false; } - final boolean hasNotPassed = Chronos.currentTimeMillis() < _stamp; + final boolean hasNotPassed = System.currentTimeMillis() < _stamp; if (!hasNotPassed) { _stamp = 0; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java index ee9eae0d6b..8c7fcba7c9 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -30,7 +30,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; @@ -220,7 +219,7 @@ public class Attackable extends Npc if (_firstCommandChannelAttacked != null) { _commandChannelTimer = new CommandChannelTimer(this); - _commandChannelLastAttack = Chronos.currentTimeMillis(); + _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } @@ -229,7 +228,7 @@ public class Attackable extends Npc } else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel { - _commandChannelLastAttack = Chronos.currentTimeMillis(); // update last attack time + _commandChannelLastAttack = System.currentTimeMillis(); // update last attack time } } @@ -608,7 +607,7 @@ public class Attackable extends Npc } if (useVitalityRate()) { - if (attacker.getSayhaGraceSupportEndTime() < Chronos.currentTimeMillis()) + if (attacker.getSayhaGraceSupportEndTime() < System.currentTimeMillis()) { attacker.updateVitalityPoints(getVitalityPoints(attacker.getLevel(), exp, _isRaid), true, false); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java index b116eab9cd..976da9b0f8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -41,7 +41,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.EmptyQueue; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.ai.AttackableAI; @@ -1486,7 +1485,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if ((group > 0) && !_reuseTimeStampsItems.isEmpty()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : _reuseTimeStampsItems.values()) { if (ts.getSharedReuseGroup() == group) @@ -1616,7 +1615,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return; } - _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? Chronos.currentTimeMillis() + delay : Long.MAX_VALUE); + _disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE); } /** @@ -1664,7 +1663,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { return false; } - if (stamp < Chronos.currentTimeMillis()) + if (stamp < System.currentTimeMillis()) { _disabledSkills.remove(hashCode); return false; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Npc.java index f1951e8847..ca447b23b2 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; @@ -207,7 +206,7 @@ public class Npc extends Creature public void onRandomAnimation(int animationId) { // Send a packet SocialAction to all Player in the _KnownPlayers of the Npc - final long now = Chronos.currentTimeMillis(); + final long now = System.currentTimeMillis(); if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) { _lastSocialBroadcast = now; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java index 8b312895e5..73a8874257 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -50,7 +50,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.LoginServerThread; @@ -2905,7 +2904,7 @@ public class Player extends Playable public void setOnlineTime(long time) { _onlineTime = time; - _onlineBeginTime = Chronos.currentTimeMillis(); + _onlineBeginTime = System.currentTimeMillis(); } /** @@ -3988,22 +3987,22 @@ public class Player extends Playable public boolean isSpawnProtected() { - return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > Chronos.currentTimeMillis()); + return (_spawnProtectEndTime != 0) && (_spawnProtectEndTime > System.currentTimeMillis()); } public boolean isTeleportProtected() { - return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > Chronos.currentTimeMillis()); + return (_teleportProtectEndTime != 0) && (_teleportProtectEndTime > System.currentTimeMillis()); } public void setSpawnProtection(boolean protect) { - _spawnProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; + _spawnProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_SPAWN_PROTECTION * 1000) : 0; } public void setTeleportProtection(boolean protect) { - _teleportProtectEndTime = protect ? Chronos.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; + _teleportProtectEndTime = protect ? System.currentTimeMillis() + (Config.PLAYER_TELEPORT_PROTECTION * 1000) : 0; } /** @@ -5367,7 +5366,7 @@ public class Player extends Playable { return; } - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); if (_pvpFlag == 0) { startPvPFlag(); @@ -5400,11 +5399,11 @@ public class Player extends Playable { if (checkIfPvP(targetPlayer)) { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_PVP_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_PVP_TIME); } else { - setPvpFlagLasts(Chronos.currentTimeMillis() + Config.PVP_NORMAL_TIME); + setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); } if (_pvpFlag == 0) { @@ -6336,7 +6335,7 @@ public class Player extends Playable public long getUptime() { - return Chronos.currentTimeMillis() - _uptime; + return System.currentTimeMillis() - _uptime; } /** @@ -6580,7 +6579,7 @@ public class Player extends Playable PreparedStatement statement = con.prepareStatement("UPDATE characters SET online=?, lastAccess=? WHERE charId=?")) { statement.setInt(1, isOnlineInt()); - statement.setLong(2, Chronos.currentTimeMillis()); + statement.setLong(2, System.currentTimeMillis()); statement.setInt(3, getObjectId()); statement.execute(); } @@ -6707,12 +6706,12 @@ public class Player extends Playable } player.setClanJoinExpiryTime(rset.getLong("clan_join_expiry_time")); - if (player.getClanJoinExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) { player.setClanJoinExpiryTime(0); } player.setClanCreateExpiryTime(rset.getLong("clan_create_expiry_time")); - if (player.getClanCreateExpiryTime() < Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) { player.setClanCreateExpiryTime(0); } @@ -6772,7 +6771,7 @@ public class Player extends Playable player.getAppearance().setTitleColor(titleColor); } player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId)); - player.setUptime(Chronos.currentTimeMillis()); + player.setUptime(System.currentTimeMillis()); currentHp = rset.getDouble("curHp"); currentCp = rset.getDouble("curCp"); @@ -7322,7 +7321,7 @@ public class Player extends Playable long totalOnlineTime = _onlineTime; if (_onlineBeginTime > 0) { - totalOnlineTime += (Chronos.currentTimeMillis() - _onlineBeginTime) / 1000; + totalOnlineTime += (System.currentTimeMillis() - _onlineBeginTime) / 1000; } statement.setLong(34, _offlineShopStart > 0 ? _onlineTime : totalOnlineTime); statement.setInt(35, isNoble() ? 1 : 0); @@ -7409,7 +7408,7 @@ public class Player extends Playable int buffIndex = 0; final List storedSkills = new ArrayList<>(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); // Store all effect data along with calulated remaining // reuse delays for matching skills. 'restore_type'= 0. @@ -7524,7 +7523,7 @@ public class Player extends Playable ps1.setInt(1, getObjectId()); ps1.execute(); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (TimeStamp ts : getItemReuseTimeStamps().values()) { if ((ts != null) && (currentTime < ts.getStamp())) @@ -7814,7 +7813,7 @@ public class Player extends Playable statement.setInt(2, _classIndex); try (ResultSet rset = statement.executeQuery()) { - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { final int remainingTime = rset.getInt("remaining_time"); @@ -7876,7 +7875,7 @@ public class Player extends Playable long systime; boolean isInInventory; long remainingTime; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { itemId = rset.getInt("itemId"); @@ -7951,7 +7950,7 @@ public class Player extends Playable { int slot; int symbolId; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); while (rset.next()) { slot = rset.getInt("slot"); @@ -8075,7 +8074,7 @@ public class Player extends Playable // Send Server->Client UserInfo packet to this Player broadcastUserInfo(UserInfoType.BASE_STATS, UserInfoType.STAT_POINTS, UserInfoType.STAT_ABILITIES, UserInfoType.MAX_HPCPMP, UserInfoType.STATS, UserInfoType.SPEED); - final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - Chronos.currentTimeMillis(); + final long remainingTime = getVariables().getLong("HennaDuration" + slot, 0) - System.currentTimeMillis(); if ((henna.getDuration() < 0) || (remainingTime > 0)) { // Add the recovered dyes to the player's inventory and notify them. @@ -8153,8 +8152,8 @@ public class Player extends Playable // Task for henna duration if (henna.getDuration() > 0) { - getVariables().set("HennaDuration" + slotId, Chronos.currentTimeMillis() + (henna.getDuration() * 60000)); - _hennaRemoveSchedules.put(slotId, ThreadPool.schedule(new HennaDurationTask(this, slotId), Chronos.currentTimeMillis() + (henna.getDuration() * 60000))); + getVariables().set("HennaDuration" + slotId, System.currentTimeMillis() + (henna.getDuration() * 60000)); + _hennaRemoveSchedules.put(slotId, ThreadPool.schedule(new HennaDurationTask(this, slotId), System.currentTimeMillis() + (henna.getDuration() * 60000))); } // Reward henna skills @@ -12026,7 +12025,7 @@ public class Player extends Playable public void setSayhaGraceSupportEndTime(long endTime) { - if (getVariables().getLong(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, 0) < Chronos.currentTimeMillis()) + if (getVariables().getLong(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, 0) < System.currentTimeMillis()) { getVariables().set(PlayerVariables.SAYHA_GRACE_SUPPORT_ENDTIME, endTime); sendPacket(new ExUserBoostStat(this, BonusExpType.VITALITY)); @@ -12818,7 +12817,7 @@ public class Player extends Playable public int getBirthdays() { - long time = (Chronos.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; + long time = (System.currentTimeMillis() - _createDate.getTimeInMillis()) / 1000; time /= TimeUnit.DAYS.toMillis(365); return (int) time; } @@ -13059,7 +13058,7 @@ public class Player extends Playable return false; } - if ((_fallingTimestamp != 0) && (Chronos.currentTimeMillis() < _fallingTimestamp)) + if ((_fallingTimestamp != 0) && (System.currentTimeMillis() < _fallingTimestamp)) { return true; } @@ -13111,7 +13110,7 @@ public class Player extends Playable */ public void setFalling() { - _fallingTimestamp = Chronos.currentTimeMillis() + FALLING_VALIDATION_DELAY; + _fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY; } /** @@ -13132,7 +13131,7 @@ public class Player extends Playable */ public void updateLastItemAuctionRequest() { - _lastItemAuctionInfoRequest = Chronos.currentTimeMillis(); + _lastItemAuctionInfoRequest = System.currentTimeMillis(); } /** @@ -13141,7 +13140,7 @@ public class Player extends Playable */ public boolean isItemAuctionPolling() { - return (Chronos.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; + return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000; } @Override @@ -13511,7 +13510,7 @@ public class Player extends Playable public void updateNotMoveUntil() { - _notMoveUntil = Chronos.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; + _notMoveUntil = System.currentTimeMillis() + Config.PLAYER_MOVEMENT_BLOCK_TIME; } @Override @@ -14420,7 +14419,7 @@ public class Player extends Playable public boolean isInTraingCamp() { final TrainingHolder trainingHolder = getTraingCampInfo(); - return (trainingHolder != null) && (trainingHolder.getEndTime() > Chronos.currentTimeMillis()); + return (trainingHolder != null) && (trainingHolder.getEndTime() > System.currentTimeMillis()); } public AttendanceInfoHolder getAttendanceInfo() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 74ecbd67e0..ce5be97e17 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.games.BlockChecker; @@ -143,7 +142,7 @@ public class Block extends Monster { eng.increasePlayerPoints(player, team); - final int timeLeft = (int) ((eng.getStarterTime() - Chronos.currentTimeMillis()) / 1000); + final int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000); final boolean isRed = eng.getHolder().getRedPlayers().contains(player); final ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints()); final ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed)); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java index 5c4e410c17..3076f0864a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/instance/VillageMaster.java @@ -27,7 +27,6 @@ import java.util.regex.PatternSyntaxException; import java.util.stream.Collectors; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CategoryData; import org.l2jmobius.gameserver.data.xml.ClassListData; @@ -1044,13 +1043,13 @@ public class VillageMaster extends Folk player.sendPacket(SystemMessageId.YOU_CANNOT_DISSOLVE_A_CLAN_DURING_A_SIEGE_OR_WHILE_PROTECTING_A_CASTLE); return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_HAVE_ALREADY_REQUESTED_THE_DISSOLUTION_OF_S1_CLAN); return; } - clan.setDissolvingExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setDissolvingExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_DISSOLVE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); // The clan leader should take the XP penalty of a full death. diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 2e3494f542..248d1240c7 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.stat; import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.ElementalType; import org.l2jmobius.gameserver.enums.PartySmallWindowUpdateType; @@ -490,7 +489,7 @@ public class PlayerStat extends PlayableStat { return getValue(Stat.VITALITY_EXP_RATE, Config.RATE_VITALITY_EXP_MULTIPLIER); } - if (getActiveChar().getLimitedSayhaGraceEndTime() > Chronos.currentTimeMillis()) + if (getActiveChar().getLimitedSayhaGraceEndTime() > System.currentTimeMillis()) { return Config.RATE_LIMITED_SAYHA_GRACE_EXP_MULTIPLIER; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java index d734ead177..ccb6985f7b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.attackable; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; /** @@ -41,7 +40,7 @@ public class CommandChannelTimer implements Runnable return; } - if ((Chronos.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) + if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > Config.LOOT_RAIDS_PRIVILEGE_INTERVAL) { _attackable.setCommandChannelTimer(null); _attackable.setFirstCommandChannelAttacked(null); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java index e788708041..73ec1c4fc1 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.tasks.player; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.actor.Player; @@ -94,12 +93,12 @@ public class IllegalPlayerActionTask implements Runnable } case KICKBAN: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } case JAIL: { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + (Config.DEFAULT_PUNISH_PARAM * 1000), _message, getClass().getSimpleName())); break; } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/buylist/Product.java index 7507ef40eb..f3e3b7ab3b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -25,7 +25,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; @@ -121,7 +120,7 @@ public class Product return false; } - BuyListTaskManager.getInstance().add(this, Chronos.currentTimeMillis() + _restockDelay); + BuyListTaskManager.getInstance().add(this, System.currentTimeMillis() + _restockDelay); final boolean result = _count.addAndGet(-value) >= 0; save(); @@ -135,7 +134,7 @@ public class Product public void restartRestockTask(long nextRestockTime) { - final long remainTime = nextRestockTime - Chronos.currentTimeMillis(); + final long remainTime = nextRestockTime - System.currentTimeMillis(); if (remainTime > 0) { BuyListTaskManager.getInstance().update(this, remainTime); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/Clan.java index 7a92546cfb..b06408a9b3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -36,7 +36,6 @@ import java.util.stream.Collectors; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.communitybbs.BB.Forum; import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -525,7 +524,7 @@ public class Clan implements IIdentifiable, INamable if (player.isClanLeader()) { SiegeManager.getInstance().removeSiegeSkills(player); - player.setClanCreateExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } // remove Clan skills from Player @@ -565,7 +564,7 @@ public class Clan implements IIdentifiable, INamable } else { - removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? Chronos.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); + removeMemberInDatabase(exMember, clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000) : 0); } // Notify to scripts @@ -1105,12 +1104,12 @@ public class Clan implements IIdentifiable, INamable setAllyId(clanData.getInt("ally_id")); setAllyName(clanData.getString("ally_name")); setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type")); - if (_allyPenaltyExpiryTime < Chronos.currentTimeMillis()) + if (_allyPenaltyExpiryTime < System.currentTimeMillis()) { setAllyPenaltyExpiryTime(0, 0); } setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time")); - if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < Chronos.currentTimeMillis()) // 24*60*60*1000 = 86400000 + if ((_charPenaltyExpiryTime + (Config.ALT_CLAN_JOIN_DAYS * 86400000)) < System.currentTimeMillis()) // 24*60*60*1000 = 86400000 { setCharPenaltyExpiryTime(0); } @@ -2219,7 +2218,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_CANNOT_ASK_YOURSELF_TO_APPLY_TO_A_CLAN); return false; } - if (_charPenaltyExpiryTime > Chronos.currentTimeMillis()) + if (_charPenaltyExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return false; @@ -2231,7 +2230,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (target.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(target.getName()); @@ -2281,7 +2280,7 @@ public class Clan implements IIdentifiable, INamable return false; } final Clan leaderClan = player.getClan(); - if ((leaderClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) + if ((leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) && (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN)) { player.sendPacket(SystemMessageId.YOU_CAN_ACCEPT_A_NEW_CLAN_IN_THE_ALLIANCE_IN_24_H_AFTER_DISMISSING_ANOTHER_ONE); return false; @@ -2317,7 +2316,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(sm); return false; } - if (targetClan.getAllyPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) { if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEAVED) { @@ -2411,12 +2410,12 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLIANCE_YOUR_CLAN_MUST_BE_LEVEL_5_OR_HIGHER); return; } - if ((_allyPenaltyExpiryTime > Chronos.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) + if ((_allyPenaltyExpiryTime > System.currentTimeMillis()) && (_allyPenaltyType == PENALTY_TYPE_DISSOLVE_ALLY)) { player.sendPacket(SystemMessageId.YOU_CANNOT_CREATE_A_NEW_ALLIANCE_WITHIN_1_DAY_OF_DISSOLUTION); return; } - if (_dissolvingExpiryTime > Chronos.currentTimeMillis()) + if (_dissolvingExpiryTime > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_NO_ALLIANCE_CAN_BE_CREATED); return; @@ -2468,7 +2467,7 @@ public class Clan implements IIdentifiable, INamable broadcastToOnlineAllyMembers(new SystemMessage(SystemMessageId.THE_ALLIANCE_IS_DISBANDED)); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) { if (clan.getId() != getId()) @@ -2495,7 +2494,7 @@ public class Clan implements IIdentifiable, INamable player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT); return false; } - if (Chronos.currentTimeMillis() < _dissolvingExpiryTime) + if (System.currentTimeMillis() < _dissolvingExpiryTime) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOUR_CLAN_LEVEL_CANNOT_BE_INCREASED); return false; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/ClanWar.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/ClanWar.java index 6deb410a0b..f252def55a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/ClanWar.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/clan/ClanWar.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.model.actor.Player; @@ -55,9 +54,9 @@ public class ClanWar { _attackerClanId = attacker.getId(); _attackedClanId = attacked.getId(); - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _state = ClanWarState.BLOOD_DECLARATION; - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); attacker.addWar(attacked.getId(), this); attacked.addWar(attacker.getId(), this); EventDispatcher.getInstance().notifyEventAsync(new OnClanWarStart(attacker, attacked)); @@ -80,15 +79,15 @@ public class ClanWar _attackerKillCount.set(attackerKillCount); _attackedKillCount.set(attackedKillCount); _winnerClanId = winnerClan; - if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > Chronos.currentTimeMillis()) + if ((_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) > System.currentTimeMillis()) { - _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - Chronos.currentTimeMillis()); + _cancelTask = ThreadPool.schedule(this::clanWarTimeout, (_startTime + TIME_TO_CANCEL_NON_MUTUAL_CLAN_WAR) - System.currentTimeMillis()); } if (_endTime > 0) { final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT); - if (endTimePeriod > Chronos.currentTimeMillis()) + if (endTimePeriod > System.currentTimeMillis()) { ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId), 10000); } @@ -178,8 +177,8 @@ public class ClanWar winnerClan.broadcastToOnlineMembers(sm); _winnerClanId = winnerClan.getId(); - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(cancelor.getId(), winnerClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_DEFEAT) - System.currentTimeMillis()); } public void clanWarTimeout() @@ -197,8 +196,8 @@ public class ClanWar attackerClan.broadcastToOnlineMembers(sm); _state = ClanWarState.TIE; - _endTime = Chronos.currentTimeMillis(); - ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - Chronos.currentTimeMillis()); + _endTime = System.currentTimeMillis(); + ThreadPool.schedule(() -> ClanTable.getInstance().deleteClanWars(attackerClan.getId(), attackedClan.getId()), (_endTime + TIME_TO_DELETION_AFTER_CANCELLATION) - System.currentTimeMillis()); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java index bb534a5f66..2e99fb4084 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/holders/TrainingHolder.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -86,7 +85,7 @@ public class TrainingHolder implements Serializable public long getElapsedTime() { - return TimeUnit.SECONDS.convert(Chronos.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); + return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS); } public long getRemainingTime() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index c6a359d343..e8e00fb9ba 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -39,7 +39,6 @@ import java.util.stream.Stream; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -108,7 +107,7 @@ public class Instance implements IIdentifiable, INamable // Set basic instance info _id = id; _template = template; - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); _spawns = new ArrayList<>(template.getSpawns().size()); // Clone and add the spawn templates @@ -796,7 +795,7 @@ public class Instance implements IIdentifiable, INamable } // Set new cleanup task - _endTime = Chronos.currentTimeMillis() + millis; + _endTime = System.currentTimeMillis() + millis; if (minutes < 1) // Destroy instance { destroy(); @@ -900,7 +899,7 @@ public class Instance implements IIdentifiable, INamable */ public long getElapsedTime() { - return Chronos.currentTimeMillis() - _startTime; + return System.currentTimeMillis() - _startTime; } /** @@ -909,7 +908,7 @@ public class Instance implements IIdentifiable, INamable */ public long getRemainingTime() { - return (_endTime == -1) ? -1 : (_endTime - Chronos.currentTimeMillis()); + return (_endTime == -1) ? -1 : (_endTime - System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index 6d893c11e6..2fd8f5e328 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.GroupType; import org.l2jmobius.gameserver.enums.InstanceReenterType; @@ -563,7 +562,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl { if (data.getTime() > 0) { - time = Chronos.currentTimeMillis() + data.getTime(); + time = System.currentTimeMillis() + data.getTime(); break; } @@ -573,7 +572,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl calendar.set(Calendar.SECOND, 0); // If calendar time is lower than current, add one more day - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.DAY_OF_MONTH, 1); } @@ -590,7 +589,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Set exact day. If modified date is before current, add one more week. calendar.set(Calendar.DAY_OF_WEEK, day); - if (calendar.getTimeInMillis() <= Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() <= System.currentTimeMillis()) { calendar.add(Calendar.WEEK_OF_MONTH, 1); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index a0fd889952..842d385a19 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.instancezone.conditions; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Npc; @@ -40,6 +39,6 @@ public class ConditionReenter extends Condition protected boolean test(Player player, Npc npc) { final int instanceId = getParameters().getInt("instanceId", getInstanceTemplate().getId()); - return Chronos.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); + return System.currentTimeMillis() > InstanceManager.getInstance().getInstanceTime(player, instanceId); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java index d3d195d079..3a6216acbe 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.AgathionData; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; @@ -204,7 +203,7 @@ public class Item extends WorldObject _type2 = 0; _dropTime = 0; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -227,7 +226,7 @@ public class Item extends WorldObject super.setName(_itemTemplate.getName()); _loc = ItemLocation.VOID; _mana = _itemTemplate.getDuration(); - _time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); + _time = _itemTemplate.getTime() == -1 ? -1 : System.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -1576,7 +1575,7 @@ public class Item extends WorldObject setSpawned(true); setXYZ(x, y, z); - setDropTime(Chronos.currentTimeMillis()); + setDropTime(System.currentTimeMillis()); setDropperObjectId(dropper != null ? dropper.getObjectId() : 0); // Set the dropper Id for the knownlist packets in sendInfo // Add the Item dropped in the world as a visible object @@ -1855,7 +1854,7 @@ public class Item extends WorldObject public long getRemainingTime() { - return _time - Chronos.currentTimeMillis(); + return _time - System.currentTimeMillis(); } public void endOfLife() @@ -2509,7 +2508,7 @@ public class Item extends WorldObject if (getVisualLifeTime() > 0) { final long endTime = getVisualLifeTime(); - if ((endTime - Chronos.currentTimeMillis()) > 0) + if ((endTime - System.currentTimeMillis()) > 0) { ItemAppearanceTaskManager.getInstance().add(this, endTime); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index d51a9b03d2..92bd38e180 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; @@ -182,12 +181,12 @@ public class ItemAuction public long getStartingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public long getFinishingTimeRemaining() { - return Math.max(_endingTime - Chronos.currentTimeMillis(), 0); + return Math.max(_endingTime - System.currentTimeMillis(), 0); } public void storeMe() @@ -340,7 +339,7 @@ public class ItemAuction _highestBid = bid; } - if ((_endingTime - Chronos.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes + if ((_endingTime - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes { switch (_auctionEndingExtendState) { @@ -427,7 +426,7 @@ public class ItemAuction } case FINISHED: { - if (_startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) + if (_startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))) { return false; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 39ad0407c8..87d3662e70 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -41,7 +41,6 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -244,7 +243,7 @@ public class ItemAuctionInstance { case 0: { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } case 1: @@ -253,10 +252,10 @@ public class ItemAuctionInstance { case CREATED: { - if (auctions[0].getStartingTime() < (Chronos.currentTimeMillis() + START_TIME_SPACE)) + if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } else { @@ -267,13 +266,13 @@ public class ItemAuctionInstance case STARTED: { currentAuction = auctions[0]; - nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, Chronos.currentTimeMillis() + START_TIME_SPACE)); + nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE)); break; } case FINISHED: { currentAuction = auctions[0]; - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); break; } default: @@ -288,7 +287,7 @@ public class ItemAuctionInstance { Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed()); // just to make sure we won't skip any auction because of little different times - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (ItemAuction auction : auctions) { if (auction.getAuctionState() == ItemAuctionState.STARTED) @@ -312,7 +311,7 @@ public class ItemAuctionInstance } if (nextAuction == null) { - nextAuction = createAuction(Chronos.currentTimeMillis() + START_TIME_SPACE); + nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE); } break; } @@ -327,17 +326,17 @@ public class ItemAuctionInstance { if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0))); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0))); } LOGGER.info(getClass().getSimpleName() + ": Schedule current auction " + currentAuction.getAuctionId() + " for instance " + _instanceId); } else { - setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0))); LOGGER.info(getClass().getSimpleName() + ": Schedule next auction " + nextAuction.getAuctionId() + " on " + DATE_FORMAT.format(new Date(nextAuction.getStartingTime())) + " for instance " + _instanceId); } } @@ -423,7 +422,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -433,7 +432,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -443,7 +442,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } break; @@ -453,7 +452,7 @@ public class ItemAuctionInstance if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) { _auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A); - setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - Chronos.currentTimeMillis(), 0))); + setStateTask(ThreadPool.schedule(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0))); return; } } @@ -578,7 +577,7 @@ public class ItemAuctionInstance return null; } - if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (Chronos.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) + if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS)))) { LOGGER.info(getClass().getSimpleName() + ": Clearing expired auction: " + auctionId); try (PreparedStatement ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 6a3523aceb..0d9104ee74 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -21,7 +21,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.enums.PartyMessageType; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; @@ -85,7 +84,7 @@ public abstract class AbstractOlympiadGame protected boolean makeCompetitionStart() { - _startTime = Chronos.currentTimeMillis(); + _startTime = System.currentTimeMillis(); return !_aborted; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 55574f19c8..620232aff3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.sql.ClanTable; @@ -791,7 +790,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", template.getName() + " was defeated"); @@ -812,7 +811,7 @@ public class Hero // Prepare new data final StatSet diaryEntry = new StatSet(); - final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(Chronos.currentTimeMillis())); + final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis())); diaryEntry.set("date", date); diaryEntry.set("action", castle.getName() + " Castle was successfuly taken"); @@ -826,7 +825,7 @@ public class Hero PreparedStatement ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) { ps.setInt(1, charId); - ps.setLong(2, Chronos.currentTimeMillis()); + ps.setLong(2, System.currentTimeMillis()); ps.setInt(3, action); ps.setInt(4, param); ps.execute(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index 5b1773f5d8..aebeb46ec7 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -27,7 +27,6 @@ import java.util.logging.Level; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.World; @@ -545,7 +544,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (Chronos.currentTimeMillis() - _startTime); + final long _fightTime = (System.currentTimeMillis() - _startTime); double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 00bc9cb292..dca8763da9 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IPunishmentHandler; import org.l2jmobius.gameserver.handler.PunishmentHandler; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; @@ -134,7 +133,7 @@ public class PunishmentTask implements Runnable */ public boolean isExpired() { - return (_expirationTime > 0) && (Chronos.currentTimeMillis() > _expirationTime); + return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime); } /** @@ -150,7 +149,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPool.schedule(this, (_expirationTime - Chronos.currentTimeMillis())); + _task = ThreadPool.schedule(this, (_expirationTime - System.currentTimeMillis())); } } @@ -227,7 +226,7 @@ public class PunishmentTask implements Runnable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement st = con.prepareStatement(UPDATE_QUERY)) { - st.setLong(1, Chronos.currentTimeMillis()); + st.setLong(1, System.currentTimeMillis()); st.setLong(2, _id); st.execute(); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java index 22074f54c9..a37f196024 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/LongTimeEvent.java @@ -34,7 +34,6 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -102,7 +101,7 @@ public class LongTimeEvent extends Quest } else if (_eventPeriod.getStartDate().after(new Date())) { - final long delay = _eventPeriod.getStartDate().getTime() - Chronos.currentTimeMillis(); + final long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis(); ThreadPool.schedule(new ScheduleStart(), delay); LOGGER.info("Event " + _eventName + " will be started at " + _eventPeriod.getStartDate()); } @@ -300,7 +299,7 @@ public class LongTimeEvent extends Quest _destroyItemsOnEnd.add(itemId); // Add item deletion info to manager. - if (endtime > Chronos.currentTimeMillis()) + if (endtime > System.currentTimeMillis()) { ItemDeletionInfoManager.getInstance().addItemDate(itemId, (int) (endtime / 1000)); } @@ -335,7 +334,7 @@ public class LongTimeEvent extends Quest EventDropManager.getInstance().addDrops(this, _dropList); // Add spawns. - final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - Chronos.currentTimeMillis(); + final Long millisToEventEnd = _eventPeriod.getEndDate().getTime() - System.currentTimeMillis(); for (NpcSpawn spawn : _spawnList) { addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/QuestState.java index 1f0a595d03..dea487f539 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -846,7 +845,7 @@ public class QuestState public boolean isNowAvailable() { final String val = get(RESTART_VAR); - return (val != null) && (Long.parseLong(val) <= Chronos.currentTimeMillis()); + return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis()); } public void setSimulated(boolean simulated) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java index f202196483..f588616491 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/AbstractResidence.java @@ -28,7 +28,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.enums.SocialClass; @@ -139,7 +138,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN final int level = rs.getInt("level"); final long expiration = rs.getLong("expiration"); final ResidenceFunction func = new ResidenceFunction(id, level, expiration, this); - if ((expiration <= Chronos.currentTimeMillis()) && !func.reactivate()) + if ((expiration <= System.currentTimeMillis()) && !func.reactivate()) { removeFunction(func); continue; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ClanHall.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ClanHall.java index 2fb931a64c..a596f81eca 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ClanHall.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ClanHall.java @@ -33,7 +33,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanHallGrade; import org.l2jmobius.gameserver.enums.ClanHallType; @@ -280,7 +279,7 @@ public class ClanHall extends AbstractResidence final int failDays = getCostFailDay(); final long time = failDays > 0 ? (failDays > 8 ? Instant.now().toEpochMilli() : Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(failDays + 1)).toEpochMilli()) : _paidUntil; - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), time - System.currentTimeMillis()); } else { @@ -325,7 +324,7 @@ public class ClanHall extends AbstractResidence */ public long getNextPayment() { - return (_checkPaymentTask != null) ? Chronos.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; + return (_checkPaymentTask != null) ? System.currentTimeMillis() + _checkPaymentTask.getDelay(TimeUnit.MILLISECONDS) : 0; } public Location getOwnerLocation() @@ -397,7 +396,7 @@ public class ClanHall extends AbstractResidence { _owner.getWarehouse().destroyItem("Clan Hall Lease", Inventory.ADENA_ID, _lease, null, null); setPaidUntil(Instant.ofEpochMilli(_paidUntil).plus(Duration.ofDays(7)).toEpochMilli()); - _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - Chronos.currentTimeMillis()); + _checkPaymentTask = ThreadPool.schedule(new CheckPaymentTask(), _paidUntil - System.currentTimeMillis()); updateDB(); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java index e95dffcbba..27c5942b21 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ClanHallAuction.java @@ -29,7 +29,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ClanHallData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -84,7 +83,7 @@ public class ClanHallAuction public void addBid(Clan clan, long bid) { - addBid(clan, bid, Chronos.currentTimeMillis()); + addBid(clan, bid, System.currentTimeMillis()); } public void addBid(Clan clan, long bid, long bidTime) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index fc74267ac4..e4b60b5264 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; @@ -64,9 +63,9 @@ public class ResidenceFunction private void init() { final ResidenceFunctionTemplate template = getTemplate(); - if ((template != null) && (_expiration > Chronos.currentTimeMillis())) + if ((template != null) && (_expiration > System.currentTimeMillis())) { - _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - Chronos.currentTimeMillis()); + _task = ThreadPool.schedule(this::onFunctionExpiration, _expiration - System.currentTimeMillis()); } } @@ -171,7 +170,7 @@ public class ResidenceFunction if (wh.destroyItem("FunctionFee", item, template.getCost().getCount(), null, this) != null) { - _expiration = Chronos.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); + _expiration = System.currentTimeMillis() + (template.getDuration().getSeconds() * 1000); init(); } return true; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java index af7fd2e85e..3a425c9b03 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/shuttle/ShuttleStop.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.shuttle; import java.util.ArrayList; import java.util.List; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Location; /** @@ -30,7 +29,7 @@ public class ShuttleStop private final int _id; private boolean _isOpen = true; private final List _dimensions = new ArrayList<>(3); - private long _lastDoorStatusChanges = Chronos.currentTimeMillis(); + private long _lastDoorStatusChanges = System.currentTimeMillis(); public ShuttleStop(int id) { @@ -65,7 +64,7 @@ public class ShuttleStop } _isOpen = true; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public void closeDoor() @@ -76,11 +75,11 @@ public class ShuttleStop } _isOpen = false; - _lastDoorStatusChanges = Chronos.currentTimeMillis(); + _lastDoorStatusChanges = System.currentTimeMillis(); } public boolean hasDoorChanged() { - return (Chronos.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; + return (System.currentTimeMillis() - _lastDoorStatusChanges) <= 1000; } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Castle.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Castle.java index 210c516669..729c5dcb38 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Castle.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Castle.java @@ -32,7 +32,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.CastleData; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -165,7 +164,7 @@ public class Castle extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -200,7 +199,7 @@ public class Castle extends AbstractResidence fee = _tempFee; } - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Fort.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Fort.java index ac8fbf6518..932d377cc5 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Fort.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Fort.java @@ -35,7 +35,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.SpawnTable; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.DoorData; @@ -162,7 +161,7 @@ public class Fort extends AbstractResidence { return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); if (_endDate > currentTime) { ThreadPool.schedule(new FunctionTask(cwh), _endDate - currentTime); @@ -192,7 +191,7 @@ public class Fort extends AbstractResidence if ((_fortOwner.getWarehouse().getAdena() >= _fee) || !_cwh) { final int fee = _endDate == -1 ? _tempFee : _fee; - setEndTime(Chronos.currentTimeMillis() + _rate); + setEndTime(System.currentTimeMillis() + _rate); dbSave(); if (_cwh) { @@ -579,7 +578,7 @@ public class Fort extends AbstractResidence clan.setFortId(getResidenceId()); setOwnerClan(clan); final int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60); - long initial = Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); + long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000)) { initial -= Config.FS_UPDATE_FRQ * 60000; @@ -785,7 +784,7 @@ public class Fort extends AbstractResidence if (clan != null) { clanId = clan.getId(); - _lastOwnedTime.setTimeInMillis(Chronos.currentTimeMillis()); + _lastOwnedTime.setTimeInMillis(System.currentTimeMillis()); } else { @@ -919,12 +918,12 @@ public class Fort extends AbstractResidence public int getOwnedTime() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((Chronos.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000); } public int getTimeTillRebelArmy() { - return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - Chronos.currentTimeMillis()) / 1000); + return _lastOwnedTime.getTimeInMillis() == 0 ? 0 : (int) (((_lastOwnedTime.getTimeInMillis() + (Config.FS_MAX_OWN_TIME * 3600000)) - System.currentTimeMillis()) / 1000); } public long getTimeTillNextFortUpdate() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Siege.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Siege.java index 8618a787ae..c53db37e26 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Siege.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/siege/Siege.java @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.cache.RelationCache; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.SiegeScheduleData; @@ -1451,9 +1450,9 @@ public class Siege implements Siegable } final Calendar calendar = _castle.getSiegeDate(); - if (calendar.getTimeInMillis() < Chronos.currentTimeMillis()) + if (calendar.getTimeInMillis() < System.currentTimeMillis()) { - calendar.setTimeInMillis(Chronos.currentTimeMillis()); + calendar.setTimeInMillis(System.currentTimeMillis()); } calendar.set(Calendar.DAY_OF_WEEK, holder.getDay()); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java index bc857bbf7a..658d3c3651 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/zone/type/NoRestartZone.java @@ -16,7 +16,6 @@ */ package org.l2jmobius.gameserver.model.zone.type; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; @@ -99,7 +98,7 @@ public class NoRestartZone extends ZoneType return; } - if (((Chronos.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((Chronos.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) + if (((System.currentTimeMillis() - player.getLastAccess()) > _restartTime) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > _restartAllowedTime)) { player.teleToLocation(TeleportWhereType.TOWN); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/GameClient.java index b2c99ae828..ae410e02d7 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/GameClient.java @@ -31,7 +31,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.ICrypt; import org.l2jmobius.commons.network.IIncomingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.LoginServerThread.SessionKey; import org.l2jmobius.gameserver.data.sql.CharNameTable; @@ -345,7 +344,7 @@ public class GameClient extends ChannelInboundHandler try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) { - ps2.setLong(1, Chronos.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + ps2.setLong(1, System.currentTimeMillis() + (Config.DELETE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 ps2.setInt(2, objectId); ps2.execute(); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java index 4238b7e0e9..f061fa721f 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AllyDismiss.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -82,7 +81,7 @@ public class AllyDismiss implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); leaderClan.setAllyPenaltyExpiryTime(currentTime + (Config.ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED * 86400000), Clan.PENALTY_TYPE_DISMISS_CLAN); // 24*60*60*1000 = 86400000 leaderClan.updateClanInDB(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java index 6ba2c80c6b..b9e6eab661 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/AllyLeave.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class AllyLeave implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); clan.setAllyId(0); clan.setAllyName(null); clan.changeAllyCrest(0, true); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 8880336ce1..e3c6f5c1af 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.LoginServerThread; import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; @@ -547,7 +546,7 @@ public class EnterWorld implements IClientIncomingPacket } } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_ARE_DISMISSED_FROM_A_CLAN_YOU_CANNOT_JOIN_ANOTHER_FOR_24_H); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java index 211bc32c3e..446ad730f3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java @@ -20,7 +20,6 @@ import java.util.Arrays; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.data.xml.DoorData; import org.l2jmobius.gameserver.enums.AdminTeleportType; @@ -75,7 +74,7 @@ public class MoveBackwardToLocation implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java index 2dbf7b9cee..efa35ef799 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -70,7 +69,7 @@ public class RequestExSetPledgeCrestLarge implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java index cb5c08f036..d4e22b4a84 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinSiege.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -70,7 +69,7 @@ public class RequestJoinSiege implements IClientIncomingPacket { if (_isJoining == 1) { - if (Chronos.currentTimeMillis() < clan.getDissolvingExpiryTime()) + if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) { player.sendPacket(SystemMessageId.YOUR_CLAN_MAY_NOT_REGISTER_TO_PARTICIPATE_IN_A_SIEGE_WHILE_UNDER_A_GRACE_PERIOD_OF_THE_CLAN_S_DISSOLUTION); return; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index ec1f903d13..cf47485a02 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; @@ -62,7 +61,7 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket return; } - if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > Chronos.currentTimeMillis())) + if ((Config.PLAYER_MOVEMENT_BLOCK_TIME > 0) && !player.isGM() && (player.getNotMoveUntil() > System.currentTimeMillis())) { player.sendPacket(SystemMessageId.YOU_CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC_ONE_MOMENT_PLEASE); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java index 73c7d4aa2c..479f357641 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; @@ -82,8 +81,8 @@ public class RequestOustPledgeMember implements IClientIncomingPacket } // this also updates the database - clan.removeClanMember(member.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 - clan.setCharPenaltyExpiryTime(Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 clan.updateClanInDB(); final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_DISMISSED_FROM_THE_CLAN); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java index fec0dc36a0..f2f627bb6d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionFeedback.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.PacketLogger; @@ -70,7 +69,7 @@ public class RequestPetitionFeedback implements IClientIncomingPacket statement.setString(2, player.getLastPetitionGmName()); statement.setInt(3, _rate); statement.setString(4, _message); - statement.setLong(5, Chronos.currentTimeMillis()); + statement.setLong(5, System.currentTimeMillis()); statement.execute(); } catch (SQLException e) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java index d8d4b53eb5..a8fdda6dd1 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -66,12 +65,12 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP final Clan clan = pledgeRecruitInfo.getClan(); if ((clan != null) && (player.getClan() == null)) { - if (clan.getCharPenaltyExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getCharPenaltyExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.YOU_CANNOT_ACCEPT_A_NEW_CLAN_MEMBER_FOR_24_H_AFTER_DISMISSING_SOMEONE); return; } - if (player.getClanJoinExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanJoinExpiryTime() > System.currentTimeMillis()) { final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_S2_MIN_AFTER_LEAVING_THE_PREVIOUS_ONE); sm.addString(player.getName()); @@ -124,7 +123,7 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP // This activates the clan tab on the new member. PledgeShowMemberListAll.sendAllTo(player); player.setClanJoinExpiryTime(0); - player.setClanJoinTime(Chronos.currentTimeMillis()); + player.setClanJoinTime(System.currentTimeMillis()); player.broadcastUserInfo(); ClanEntryManager.getInstance().removePlayerApplication(_clanId, player.getObjectId()); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java index 1999f01379..591f38d131 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.ClanEntryManager; import org.l2jmobius.gameserver.instancemanager.FortManager; @@ -105,7 +104,7 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket // This activates the clan tab on the new member. PledgeShowMemberListAll.sendAllTo(target); target.setClanJoinExpiryTime(0); - player.setClanJoinTime(Chronos.currentTimeMillis()); + player.setClanJoinTime(System.currentTimeMillis()); target.broadcastUserInfo(); ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 38fe59bf79..c9f0171c5b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.enums.CrestType; import org.l2jmobius.gameserver.model.Crest; @@ -75,7 +74,7 @@ public class RequestSetPledgeCrest implements IClientIncomingPacket return; } - if (clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(SystemMessageId.AS_YOU_ARE_CURRENTLY_SCHEDULE_FOR_CLAN_DISSOLUTION_YOU_CANNOT_REGISTER_OR_DELETE_A_CLAN_CREST); return; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java index 356308bbbd..29e525f1b0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -102,7 +101,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket player.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java index 743f92515d..7ff8b8c71b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestWithdrawalPledge.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -63,7 +62,7 @@ public class RequestWithdrawalPledge implements IClientIncomingPacket } final Clan clan = player.getClan(); - clan.removeClanMember(player.getObjectId(), Chronos.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 + clan.removeClanMember(player.getObjectId(), System.currentTimeMillis() + (Config.ALT_CLAN_JOIN_DAYS * 86400000)); // 24*60*60*1000 = 86400000 final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN); sm.addString(player.getName()); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index de5fcf3f8e..faa5b67eb0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -288,7 +287,7 @@ public class UseItem implements IClientIncomingPacket else if (player.isAttackingNow()) { // Equip or unEquip. - ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + ThreadPool.schedule(() -> player.useEquippableItem(item, false), player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 1ec5c99502..b0a305c58d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.appearance; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.InventorySlot; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -253,7 +252,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket if ((appearanceStone.getType() != AppearanceType.RESTORE) && (appearanceStone.getLifeTime() > 0)) { - targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, Chronos.currentTimeMillis() + appearanceStone.getLifeTime()); + targetItem.getVariables().set(ItemVariables.VISUAL_APPEARANCE_LIFE_TIME, System.currentTimeMillis() + appearanceStone.getLifeTime()); targetItem.scheduleVisualLifeTime(); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java index 7ad2e0475b..462edca304 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestEnchantItem.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -132,7 +131,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // Fast auto-enchant cheat check. - if ((request.getTimestamp() == 0) || ((Chronos.currentTimeMillis() - request.getTimestamp()) < 1000)) + if ((request.getTimestamp() == 0) || ((System.currentTimeMillis() - request.getTimestamp()) < 1000)) { Util.handleIllegalPlayerAction(player, player + " use autoenchant program ", Config.DEFAULT_PUNISH); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExAddEnchantScrollItem.java index d39b232586..11a35c81e8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExAddEnchantScrollItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.enchant; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -80,7 +79,7 @@ public class RequestExAddEnchantScrollItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantScrollItemResult(_scrollObjectId)); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantSupportItem.java index 1bc406ccd2..8ebbb21ba0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.enchant; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -88,7 +87,7 @@ public class RequestExTryToPutEnchantSupportItem implements IClientIncomingPacke } request.setSupportItem(support.getObjectId()); - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId)); player.sendPacket(new ChangedEnchantTargetItemProbabilityList(player, false)); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java index e569522817..8110271a9e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.enchant; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; @@ -86,7 +85,7 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket return; } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(new ExPutEnchantTargetItemResult(_objectId)); player.sendPacket(new ChangedEnchantTargetItemProbabilityList(player, false)); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java index 4d2e52f08a..b2aa5d3834 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.huntingzones; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.QuestManager; @@ -109,7 +108,7 @@ public class ExTimedHuntingZoneEnter implements IClientIncomingPacket return; } - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); final int instanceId = holder.getInstanceId(); if ((instanceId > 0) && holder.isSoloInstance()) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index e4ad042344..f400170476 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -107,8 +107,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket /* * if ((mentor == null) || (mentee == null)) { return false; } else if (!mentee.isOnline()) { mentor.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); return false; } else if (!mentor.isInCategory(CategoryType.SIXTH_CLASS_GROUP)) { - * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > Chronos.currentTimeMillis()) { long remainingTime = - * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - Chronos.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int + * mentor.sendPacket(SystemMessageId.YOU_MUST_AWAKEN_IN_ORDER_TO_BECOME_A_MENTOR); return false; } else if (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) > System.currentTimeMillis()) { long remainingTime = + * (MentorManager.getInstance().getMentorPenalty(mentor.getObjectId()) - System.currentTimeMillis()) / 1000; final int days = (int) (remainingTime / 86400); remainingTime = remainingTime % 86400; final int hours = (int) (remainingTime / 3600); remainingTime = remainingTime % 3600; final int * minutes = (int) (remainingTime / 60); final SystemMessage msg = new SystemMessage(SystemMessageId.YOU_CAN_BOND_WITH_A_NEW_MENTEE_IN_S1_DAY_S_S2_HOUR_S_S3_MINUTE_S); msg.addInt(days); msg.addInt(hours); msg.addInt(minutes); mentor.sendPacket(msg); return false; } else if * (mentor.getObjectId() == mentee.getObjectId()) { mentor.sendPacket(SystemMessageId.YOU_CANNOT_BECOME_YOUR_OWN_MENTEE); return false; } else if (mentee.getLevel() >= 86) { mentor.sendPacket(new * SystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) { mentor.sendPacket(SystemMessageId.INVITATION_CAN_OCCUR_ONLY_WHEN_THE_MENTEE_IS_IN_MAIN_CLASS_STATUS); return false; } // else diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index e6cd27430c..780cc168fe 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -4,7 +4,6 @@ import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.ai.NextAction; @@ -183,7 +182,7 @@ public class ExPetEquipItem implements IClientIncomingPacket { Item transferedItem = player.transferItem("UnequipFromPet", item.getObjectId(), 1, pet.getInventory(), null); pet.useEquippableItem(transferedItem, false); - }, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(Chronos.currentTimeMillis())); + }, player.getAttackEndTime() - TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis())); } else { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java index e0975d5bb7..5bd8eb9386 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV3/RequestExPledgeEnemyRegister.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgeV3; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.enums.ClanWarState; import org.l2jmobius.gameserver.enums.UserInfoType; @@ -90,7 +89,7 @@ public class RequestExPledgeEnemyRegister implements IClientIncomingPacket client.sendPacket(ActionFailed.STATIC_PACKET); return; } - else if (clanDeclaredWar.getDissolvingExpiryTime() > Chronos.currentTimeMillis()) + else if (clanDeclaredWar.getDissolvingExpiryTime() > System.currentTimeMillis()) { client.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_NOT_BE_DECLARED_AGAINST_A_CLAN_THAT_IS_BEING_DISSOLVED)); client.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java index c1b9bfc2c1..1aa48d30b1 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pledgedonation/RequestExPledgeDonationInfo.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.pledgedonation; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.GameClient; @@ -50,6 +49,6 @@ public class RequestExPledgeDonationInfo implements IClientIncomingPacket return; } - player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (player.getClanJoinTime() + 86400000) < Chronos.currentTimeMillis())); + player.sendPacket(new ExPledgeDonationInfo(player.getClanDonationPoints(), (player.getClanJoinTime() + 86400000) < System.currentTimeMillis())); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index 65fb6e4413..0dea0570f4 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; import org.l2jmobius.gameserver.model.actor.Player; @@ -139,7 +138,7 @@ public class RequestBRBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java index 7cfdb01cbe..8905a5a01d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRPresentBuyProduct.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.CharNameTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.enums.ExBrProductReplyType; @@ -152,7 +151,7 @@ public class RequestBRPresentBuyProduct implements IClientIncomingPacket */ private static boolean validatePlayer(PrimeShopGroup item, int count, Player player) { - final long currentTime = Chronos.currentTimeMillis() / 1000; + final long currentTime = System.currentTimeMillis() / 1000; if (item == null) { player.sendPacket(new ExBRBuyProduct(ExBrProductReplyType.INVALID_PRODUCT)); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java index 03e69980fa..3aa9e905a0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.clientpackets.teleports; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.NpcData; import org.l2jmobius.gameserver.data.xml.RaidTeleportListData; import org.l2jmobius.gameserver.enums.RaidBossStatus; @@ -121,9 +120,9 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket } final int price; - if ((Chronos.currentTimeMillis() - player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) > 86400000) + if ((System.currentTimeMillis() - player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) > 86400000) { - player.getVariables().set("LastFreeRaidTeleportTime", Chronos.currentTimeMillis()); + player.getVariables().set("LastFreeRaidTeleportTime", System.currentTimeMillis()); price = 0; } else diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java index e5f052f871..a79feced31 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.clientpackets.training; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.network.GameClient; @@ -53,7 +52,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket if (holder.isTraining()) { - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); player.enableAllSkills(); player.setInvul(false); @@ -61,7 +60,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket player.setImmobilized(false); player.teleToLocation(player.getLastLocation()); player.sendPacket(ExTrainingZone_Leaving.STATIC_PACKET); - holder.setEndTime(Chronos.currentTimeMillis()); + holder.setEndTime(System.currentTimeMillis()); player.setTraingCampInfo(holder); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java index 3f1213f2ee..ee1c787150 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/loginserverpackets/game/TempBan.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import org.l2jmobius.commons.network.BaseSendablePacket; -import org.l2jmobius.commons.util.Chronos; /** * @author mrTJO @@ -29,7 +28,7 @@ public class TempBan extends BaseSendablePacket writeC(0x0A); writeS(accountName); writeS(ip); - writeQ(Chronos.currentTimeMillis() + (time * 60000)); + writeQ(System.currentTimeMillis() + (time * 60000)); // if (reason != null) // { // writeC(0x01); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 3dbe8e0a57..2bf3eed8f5 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; @@ -230,7 +229,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getFace()); packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); + packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); @@ -322,7 +321,7 @@ public class CharSelectionInfo implements IClientOutgoingPacket // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); - if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) + if ((deletetime > 0) && (System.currentTimeMillis() > deletetime)) { final Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid")); if (clan != null) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index c1f7bb396b..fe5792eaf3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; @@ -53,7 +52,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 2d607b9a02..8a8da8257c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MatchingRoomManager; @@ -74,7 +73,7 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index e4c6b79ae0..8b2a069152 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.TimeUnit; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MatchingMemberType; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.instancemanager.MapRegionManager; @@ -61,7 +60,7 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(instanceTimes.size()); for (Entry entry : instanceTimes.entrySet()) { - final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - Chronos.currentTimeMillis()); + final long instanceTime = TimeUnit.MILLISECONDS.toSeconds(entry.getValue() - System.currentTimeMillis()); packet.writeD(entry.getKey()); packet.writeD((int) instanceTime); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 1a6ee00a10..355f61a44a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; @@ -45,7 +44,7 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { packet.writeD(_inbox.size()); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index b61d5b2301..da5f9f469f 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { packet.writeD(_outbox.size()); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index dfeefdaecf..a16aa90e84 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -20,7 +20,6 @@ import java.util.Calendar; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; @@ -87,7 +86,7 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); + packet.writeD((int) (System.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { final Calendar cal = Calendar.getInstance(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index 3c4c475339..3df53c1587 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.TimeStamp; import org.l2jmobius.gameserver.model.actor.Player; @@ -37,7 +36,7 @@ public class SkillCoolTime implements IClientOutgoingPacket public SkillCoolTime(Player player) { - _currentTime = Chronos.currentTimeMillis(); + _currentTime = System.currentTimeMillis(); for (TimeStamp ts : player.getSkillReuseTimeStamps().values()) { if ((_currentTime < ts.getStamp()) && !SkillData.getInstance().getSkill(ts.getSkillId(), ts.getSkillLevel(), ts.getSkillSubLevel()).isNotBroadcastable()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 57acfedd38..0e816bc6b4 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -22,7 +22,6 @@ import java.util.Collections; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.time.SchedulingPattern; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Player; @@ -48,9 +47,9 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { _player = player; _rewards = sendRewards ? DailyMissionData.getInstance().getDailyMissionData(player) : Collections.emptyList(); - _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); - _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(Chronos.currentTimeMillis()) - Chronos.currentTimeMillis()) / 1000); + _dayRemainTime = (int) ((DAILY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _weekRemainTime = (int) ((WEEKLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); + _monthRemainTime = (int) ((MONTHLY_REUSE_PATTERN.next(System.currentTimeMillis()) - System.currentTimeMillis()) / 1000); } @Override diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/RequestExRemoveEnchantSupportItem.java index aff1a37533..9848617d00 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/RequestExRemoveEnchantSupportItem.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.enchant; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -56,7 +55,7 @@ public class RequestExRemoveEnchantSupportItem implements IClientIncomingPacket { request.setSupportItem(Player.ID_NONE); } - request.setTimestamp(Chronos.currentTimeMillis()); + request.setTimestamp(System.currentTimeMillis()); player.sendPacket(ExRemoveEnchantSupportItemResult.STATIC_PACKET); player.sendPacket(new ChangedEnchantTargetItemProbabilityList(player, false)); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 336a384bcc..dba3848794 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets.friend; import java.util.Calendar; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -40,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) Chronos.currentTimeMillis() : (int) (Chronos.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index d0b92dbd1d..f527d6d08b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -42,7 +41,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); - packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) + packet.writeD((int) ((System.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) return true; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java index 96224b45ff..36d05e9317 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneList.java @@ -17,7 +17,6 @@ package org.l2jmobius.gameserver.network.serverpackets.huntingzones; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; @@ -44,7 +43,7 @@ public class TimedHuntingZoneList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_LIST.writeId(packet); - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); packet.writeD(TimedHuntingZoneData.getInstance().getSize()); // zone count for (TimedHuntingZoneHolder holder : TimedHuntingZoneData.getInstance().getAllHuntingZones()) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index 9d206480d8..b846132413 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -20,7 +20,6 @@ import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; /** * Abstract class for classes that are meant to be implemented by scripts.
@@ -37,7 +36,7 @@ public abstract class ManagedScript public ManagedScript() { _scriptFile = getScriptPath(); - setLastLoadTime(Chronos.currentTimeMillis()); + setLastLoadTime(System.currentTimeMillis()); } public abstract Path getScriptPath(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java index fc462beecb..0dbebbb6d0 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; @@ -56,7 +55,7 @@ public class AttackStanceTaskManager implements Runnable } _working = true; - final long current = Chronos.currentTimeMillis(); + final long current = System.currentTimeMillis(); try { final Iterator> iterator = _attackStanceTasks.entrySet().iterator(); @@ -107,7 +106,7 @@ public class AttackStanceTaskManager implements Runnable return; } - _attackStanceTasks.put(creature, Chronos.currentTimeMillis()); + _attackStanceTasks.put(creature, System.currentTimeMillis()); } /** diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java index 78b42ea3f2..ff20d985fc 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/BuyListTaskManager.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.buylist.Product; /** @@ -53,7 +52,7 @@ public class BuyListTaskManager } _workingProducts = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : PRODUCTS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index ae6d0f7aad..21e90a66ea 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; @@ -49,7 +48,7 @@ public class DecayTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { if (time > entry.getValue().longValue()) @@ -95,7 +94,7 @@ public class DecayTaskManager implements Runnable } // Add to decay schedules. - DECAY_SCHEDULES.put(creature, Chronos.currentTimeMillis() + (delay * 1000)); + DECAY_SCHEDULES.put(creature, System.currentTimeMillis() + (delay * 1000)); } /** @@ -115,7 +114,7 @@ public class DecayTaskManager implements Runnable public long getRemainingTime(Creature creature) { final Long time = DECAY_SCHEDULES.get(creature); - return time != null ? time.longValue() - Chronos.currentTimeMillis() : Long.MAX_VALUE; + return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE; } @Override @@ -130,7 +129,7 @@ public class DecayTaskManager implements Runnable ret.append("Tasks dump:"); ret.append(Config.EOL); - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : DECAY_SCHEDULES.entrySet()) { ret.append("Class/Name: "); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java index 6abf61187a..ea7332796d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/GameTimeTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.OnDayNightChange; @@ -91,7 +90,7 @@ public class GameTimeTaskManager extends Thread */ public int getGameTicks() { - return (int) ((Chronos.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); + return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK); } /** @@ -146,7 +145,7 @@ public class GameTimeTaskManager extends Thread while (true) { - nextTickTime = ((Chronos.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; + nextTickTime = ((System.currentTimeMillis() / MILLIS_IN_TICK) * MILLIS_IN_TICK) + 100; try { @@ -157,7 +156,7 @@ public class GameTimeTaskManager extends Thread LOGGER.log(Level.WARNING, getClass().getSimpleName(), e); } - sleepTime = nextTickTime - Chronos.currentTimeMillis(); + sleepTime = nextTickTime - System.currentTimeMillis(); if (sleepTime > 0) { try diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index 6cb2c2499a..8345a3adec 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemAppearanceTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index cd6aee1bf8..5928215ad9 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.item.instance.Item; /** @@ -46,7 +45,7 @@ public class ItemLifeTimeTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index 020de875be..6c753478e4 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -48,7 +47,7 @@ public class ItemManaTaskManager implements Runnable } _working = true; - final long currentTime = Chronos.currentTimeMillis(); + final long currentTime = System.currentTimeMillis(); for (Entry entry : ITEMS.entrySet()) { if (currentTime > entry.getValue().longValue()) @@ -73,7 +72,7 @@ public class ItemManaTaskManager implements Runnable { if (!ITEMS.containsKey(item)) { - ITEMS.put(item, Chronos.currentTimeMillis() + MANA_CONSUMPTION_RATE); + ITEMS.put(item, System.currentTimeMillis() + MANA_CONSUMPTION_RATE); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index 86167d7e54..78f031a909 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.item.instance.Item; @@ -43,7 +42,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable return; } - final long curtime = Chronos.currentTimeMillis(); + final long curtime = System.currentTimeMillis(); for (Item item : _items) { if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) @@ -81,7 +80,7 @@ public class ItemsAutoDestroyTaskManager implements Runnable public void addItem(Item item) { - item.setDropTime(Chronos.currentTimeMillis()); + item.setDropTime(System.currentTimeMillis()); _items.add(item); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index cef7b4f303..47f89da24b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; @@ -53,7 +52,7 @@ public class MessageDeletionTaskManager implements Runnable Integer msgId; Message msg; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_MESSAGES.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java index 4f9a9d8fef..e5d306a98b 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/PlayerAutoSaveTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PlayerAutoSaveTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); SEARCH: for (Entry entry : PLAYER_TIMES.entrySet()) { if (time > entry.getValue().longValue()) @@ -67,7 +66,7 @@ public class PlayerAutoSaveTaskManager implements Runnable public void add(Player player) { - PLAYER_TIMES.put(player, Chronos.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); + PLAYER_TIMES.put(player, System.currentTimeMillis() + Config.CHAR_DATA_STORE_INTERVAL); } public void remove(Player player) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java index 1db93e616d..03e33bb074 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/PvpFlagTaskManager.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; /** @@ -47,7 +46,7 @@ public class PvpFlagTaskManager implements Runnable if (!PLAYERS.isEmpty()) { - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Player player : PLAYERS) { if (time > player.getPvpFlagLasts()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index a2d3c61b3b..256f3f047e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Npc; @@ -48,7 +47,7 @@ public class RandomAnimationTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { if (time > entry.getValue().longValue()) @@ -69,7 +68,7 @@ public class RandomAnimationTaskManager implements Runnable { if (npc.hasRandomAnimation()) { - PENDING_ANIMATIONS.putIfAbsent(npc, Chronos.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); + PENDING_ANIMATIONS.putIfAbsent(npc, System.currentTimeMillis() + (Rnd.get((npc.isAttackable() ? Config.MIN_MONSTER_ANIMATION : Config.MIN_NPC_ANIMATION), (npc.isAttackable() ? Config.MAX_MONSTER_ANIMATION : Config.MAX_NPC_ANIMATION)) * 1000)); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 3d3a7c9b54..80b1f4bc6f 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; @@ -47,7 +46,7 @@ public class RespawnTaskManager implements Runnable } _working = true; - final long time = Chronos.currentTimeMillis(); + final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { if (time > entry.getValue().longValue()) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java index 805b52f362..cd161c8959 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/TaskManager.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.taskmanager.tasks.TaskBirthday; import org.l2jmobius.gameserver.taskmanager.tasks.TaskCleanUp; import org.l2jmobius.gameserver.taskmanager.tasks.TaskRecom; @@ -95,7 +94,7 @@ public class TaskManager public void run() { task.onTimeElapsed(this); - lastActivation = Chronos.currentTimeMillis(); + lastActivation = System.currentTimeMillis(); try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement(SQL_STATEMENTS[1])) { @@ -243,7 +242,7 @@ public class TaskManager try { final Date desired = DateFormat.getInstance().parse(task.getParams()[0]); - final long diff = desired.getTime() - Chronos.currentTimeMillis(); + final long diff = desired.getTime() - System.currentTimeMillis(); if (diff >= 0) { task.scheduled = ThreadPool.schedule(task, diff); @@ -294,7 +293,7 @@ public class TaskManager return false; } - delay = min.getTimeInMillis() - Chronos.currentTimeMillis(); + delay = min.getTimeInMillis() - System.currentTimeMillis(); if (check.after(min) || (delay < 0)) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ui/SystemPanel.java index 21e417bf00..32c5d08d8c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ui/SystemPanel.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ui/SystemPanel.java @@ -31,7 +31,6 @@ import javax.swing.JPanel; import javax.swing.border.LineBorder; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.GameServer; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.util.Locator; @@ -43,7 +42,7 @@ public class SystemPanel extends JPanel { protected static final Logger LOGGER = Logger.getLogger(SystemPanel.class.getName()); - protected static final long START_TIME = Chronos.currentTimeMillis(); + protected static final long START_TIME = System.currentTimeMillis(); public SystemPanel() { @@ -141,7 +140,7 @@ public class SystemPanel extends JPanel lblConnected.setText("Connected: " + playerCount); lblMaxConnected.setText("Max connected: " + World.MAX_CONNECTED_COUNT); lblOfflineShops.setText("Offline trade: " + World.OFFLINE_TRADE_COUNT); - lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(Chronos.currentTimeMillis() - START_TIME)); + lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME)); } }, 1000, 1000); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java index a3d22e6493..96758c73fc 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/FloodProtectorAction.java @@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.PlayerCondOverride; import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; @@ -152,7 +151,7 @@ public class FloodProtectorAction */ private void banAccount() { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(_client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); if (LOGGER.isLoggable(Level.WARNING)) { log(" banned for flooding ", _config.PUNISHMENT_TIME <= 0 ? "forever" : "for " + (_config.PUNISHMENT_TIME / 60000) + " mins"); @@ -172,7 +171,7 @@ public class FloodProtectorAction final int charId = _client.getPlayer().getObjectId(); if (charId > 0) { - PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, Chronos.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + _config.PUNISHMENT_TIME, "", getClass().getSimpleName())); } if (LOGGER.isLoggable(Level.WARNING)) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java index 2a9bae4f90..92393a9cf6 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/OfflineTradeUtil.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.util; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.instancemanager.AntiFeedManager; import org.l2jmobius.gameserver.model.World; @@ -145,7 +144,7 @@ public class OfflineTradeUtil if (player.getOfflineStartTime() == 0) { - player.setOfflineStartTime(Chronos.currentTimeMillis()); + player.setOfflineStartTime(System.currentTimeMillis()); } // Store trade on exit, if realtime saving is enabled. diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/FloodProtectedListener.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/FloodProtectedListener.java index e2bbcc1aa3..ba2fc6536a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/FloodProtectedListener.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/FloodProtectedListener.java @@ -26,7 +26,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; /** * @author -Wooden- @@ -64,9 +63,9 @@ public abstract class FloodProtectedListener extends Thread if (fConnection != null) { fConnection.connectionNumber += 1; - if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((Chronos.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) + if (((fConnection.connectionNumber > Config.FAST_CONNECTION_LIMIT) && ((System.currentTimeMillis() - fConnection.lastConnection) < Config.NORMAL_CONNECTION_TIME)) || ((System.currentTimeMillis() - fConnection.lastConnection) < Config.FAST_CONNECTION_TIME) || (fConnection.connectionNumber > Config.MAX_CONNECTION_PER_IP)) { - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); connection.close(); fConnection.connectionNumber -= 1; if (!fConnection.isFlooding) @@ -81,11 +80,11 @@ public abstract class FloodProtectedListener extends Thread fConnection.isFlooding = false; LOGGER.info(connection.getInetAddress().getHostAddress() + " is not considered as flooding anymore."); } - fConnection.lastConnection = Chronos.currentTimeMillis(); + fConnection.lastConnection = System.currentTimeMillis(); } else { - fConnection = new ForeignConnection(Chronos.currentTimeMillis()); + fConnection = new ForeignConnection(System.currentTimeMillis()); _floodProtection.put(connection.getInetAddress().getHostAddress(), fConnection); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/LoginController.java index a6d76f5be3..99c0c729f8 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/LoginController.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/LoginController.java @@ -41,7 +41,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.GameServerTable.GameServerInfo; @@ -178,7 +177,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(USER_INFO_SELECT)) { - ps.setString(1, Long.toString(Chronos.currentTimeMillis())); + ps.setString(1, Long.toString(System.currentTimeMillis())); ps.setString(2, login); try (ResultSet rset = ps.executeQuery()) { @@ -210,7 +209,7 @@ public class LoginController { ps.setString(1, login); ps.setString(2, hashBase64); - ps.setLong(3, Chronos.currentTimeMillis()); + ps.setLong(3, System.currentTimeMillis()); ps.setInt(4, 0); ps.setString(5, addr.getHostAddress()); ps.execute(); @@ -275,7 +274,7 @@ public class LoginController */ public void addBanForAddress(InetAddress address, long duration) { - _bannedIps.putIfAbsent(address, Chronos.currentTimeMillis() + duration); + _bannedIps.putIfAbsent(address, System.currentTimeMillis() + duration); } public boolean isBannedAddress(InetAddress address) throws UnknownHostException @@ -296,7 +295,7 @@ public class LoginController } if (bi != null) { - if ((bi > 0) && (bi < Chronos.currentTimeMillis())) + if ((bi > 0) && (bi < System.currentTimeMillis())) { _bannedIps.remove(address); LOGGER.info("Removed expired ip address ban " + address.getHostAddress() + "."); @@ -543,7 +542,7 @@ public class LoginController try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ACCOUNT_INFO_UPDATE)) { - ps.setLong(1, Chronos.currentTimeMillis()); + ps.setLong(1, System.currentTimeMillis()); ps.setString(2, address.getHostAddress()); ps.setString(3, info.getLogin()); ps.execute(); @@ -615,7 +614,7 @@ public class LoginController { continue; } - if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < Chronos.currentTimeMillis()) + if ((client.getConnectionStartTime() + LOGIN_TIMEOUT) < System.currentTimeMillis()) { client.close(LoginFailReason.REASON_ACCESS_FAILED); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/network/LoginClient.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/network/LoginClient.java index dd494a56e3..8bb4bcef1f 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/network/LoginClient.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/loginserver/network/LoginClient.java @@ -27,7 +27,6 @@ import javax.crypto.SecretKey; import org.l2jmobius.commons.network.ChannelInboundHandler; import org.l2jmobius.commons.network.IIncomingPacket; import org.l2jmobius.commons.network.IOutgoingPacket; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.crypt.ScrambledKeyPair; import org.l2jmobius.loginserver.LoginController; @@ -83,14 +82,14 @@ public class LoginClient extends ChannelInboundHandler _addr = address.getAddress(); _channel = ctx.channel(); _sessionId = Rnd.nextInt(); - _connectionStartTime = Chronos.currentTimeMillis(); + _connectionStartTime = System.currentTimeMillis(); sendPacket(new Init(_scrambledPair.getScrambledModulus(), _blowfishKey.getEncoded(), _sessionId)); } @Override public void channelInactive(ChannelHandlerContext ctx) { - if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < Chronos.currentTimeMillis())) + if (!_joinedGS || ((_connectionStartTime + LoginController.LOGIN_TIMEOUT) < System.currentTimeMillis())) { LoginController.getInstance().removeAuthedLoginClient(getAccount()); }
Unable to join a clan."); htmlContent.append(format.format(player.getClanJoinExpiryTime())); @@ -55,7 +54,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if (player.getClanCreateExpiryTime() > Chronos.currentTimeMillis()) + if (player.getClanCreateExpiryTime() > System.currentTimeMillis()) { htmlContent.append("Unable to create a clan."); htmlContent.append(format.format(player.getClanCreateExpiryTime())); @@ -63,7 +62,7 @@ public class ClanPenalty implements IUserCommandHandler penalty = true; } - if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > Chronos.currentTimeMillis())) + if ((player.getClan() != null) && (player.getClan().getCharPenaltyExpiryTime() > System.currentTimeMillis())) { htmlContent.append("Unable to invite a clan member."); htmlContent.append(format.format(player.getClan().getCharPenaltyExpiryTime())); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index e7dfa01cfc..e9ea7e883a 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.l2jmobius.Config; -import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IUserCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.SystemMessageId; @@ -75,7 +74,7 @@ public class Time implements IUserCommandHandler player.sendPacket(sm); if (Config.DISPLAY_SERVER_TIME) { - player.sendMessage("Server time is " + SDF.format(new Date(Chronos.currentTimeMillis()))); + player.sendMessage("Server time is " + SDF.format(new Date(System.currentTimeMillis()))); } return true; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java index b7e743b8af..47345b9449 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java @@ -18,7 +18,6 @@ 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; @@ -104,7 +103,7 @@ public class ChatAdmin implements IVoicedCommandHandler return false; } - PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, Chronos.currentTimeMillis() + (expirationTime * 1000 * 60), "Chat banned by moderator", activeChar.getName())); + PunishmentManager.getInstance().startPunishment(new PunishmentTask(objId, PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, System.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_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index a665710972..0e9d079fd2 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -19,7 +19,6 @@ 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.Player; @@ -75,7 +74,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(Chronos.currentTimeMillis()) + "

Current Date: " + format.format(System.currentTimeMillis()) + "

Premium Info & Rules
1. Premium accounts CAN NOT BE TRANSFERED.
2. Premium does not effect party members.