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

Dropped Chronos.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-04-08 23:25:52 +00:00
parent f4bcc4b264
commit 00fa62eed8
4460 changed files with 10360 additions and 17003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameTimeTaskManager.java
View File

@@ -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);
}

9
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -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;

9
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -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)

9
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java
View File

@@ -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)

5
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
View File

@@ -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);
}

3
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java
View File

@@ -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);

80
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Chronos.java
View File

@@ -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.<br>
* To get the current time in milliseconds use Chronos.currentTimeMillis()
* @author Pantelis Andrianakis
* @version February 3rd 2021
*/
public class Chronos extends Thread
{
private long _currentTimeMillis = System.currentTimeMillis();
public Chronos()
{
super.setName("Chronos");
super.setPriority(MAX_PRIORITY);
super.setDaemon(true);
super.start();
}
@Override
public void run()
{
while (true)
{
_currentTimeMillis = System.currentTimeMillis();
// Sleep for approximately 1 millisecond.
try
{
Thread.sleep(1);
}
catch (Exception e)
{
}
}
}
/**
* Returns the current time in milliseconds. Note that while the unit of time of the return value is a millisecond,the granularity of the value depends on the underlying operating system and may be larger. For example, many operating systems measure time in units of tens of milliseconds.<br>
* <br>
* See the description of the class Date for a discussion of slight discrepancies that may arise between "computer time" and coordinated universal time (UTC).
* @return the difference, measured in milliseconds, between the current time and midnight, January 1, 1970 UTC.
*/
public static long currentTimeMillis()
{
return getInstance()._currentTimeMillis;
}
public static Chronos getInstance()
{
return SingletonHolder.INSTANCE;
}
private static class SingletonHolder
{
protected static final Chronos INSTANCE = new Chronos();
}
}