Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-14 22:55:55 +01:00
Code Issues Projects Releases Wiki Activity

Fix tps after Timer changes

Browse Source
This commit is contained in:
snowleo 2013-04-23 08:51:25 +03:00
parent 9160410a50
commit 6148583fb2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Essentials/src/com/earth2me/essentials/EssentialsTimer.java
View File

@ -12,11 +12,12 @@ public class EssentialsTimer implements Runnable
{ {
private final transient IEssentials ess; private final transient IEssentials ess;
private final transient Set<User> onlineUsers = new HashSet<User>(); private final transient Set<User> onlineUsers = new HashSet<User>();
private transient long lastPoll = System.currentTimeMillis(); private transient long lastPoll = System.nanoTime();
private final transient LinkedList<Float> history = new LinkedList<Float>(); private final LinkedList<Double> history = new LinkedList<Double>();
private int skip1 = 0; private int skip1 = 0;
private int skip2 = 0; private int skip2 = 0;
private final long maxTime = 10 * 1000000; private final long maxTime = 10 * 1000000;
private final long tickInterval = 50;
EssentialsTimer(final IEssentials ess) EssentialsTimer(final IEssentials ess)
{ {
@ -27,8 +28,8 @@ public class EssentialsTimer implements Runnable
public void run() public void run()
{ {
final long startTime = System.nanoTime(); final long startTime = System.nanoTime();
final long currentTime = System.currentTimeMillis(); //final long currentTime = System.currentTimeMillis();
long timeSpent = (currentTime - lastPoll) / 1000; long timeSpent = (startTime - lastPoll) / 1000;
if (timeSpent == 0) if (timeSpent == 0)
{ {
timeSpent = 1; timeSpent = 1;
@ -37,7 +38,7 @@ public class EssentialsTimer implements Runnable
{ {
history.remove(); history.remove();
} }
float tps = 100f / timeSpent; double tps = tickInterval * 1000000.0 / timeSpent;
if (tps <= 20) if (tps <= 20)
{ {
history.add(tps); history.add(tps);
@ -104,10 +105,10 @@ public class EssentialsTimer implements Runnable
} }
} }
public float getAverageTPS() public double getAverageTPS()
{ {
float avg = 0; double avg = 0;
for (Float f : history) for (Double f : history)
{ {
if (f != null) if (f != null)
{ {