summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/MinecraftServer.java
diff options
context:
space:
mode:
authorEvilSeph <evilseph@unaligned.org>2011-05-09 14:51:01 -0400
committerEvilSeph <evilseph@unaligned.org>2011-05-09 14:51:01 -0400
commit0faaf5af8a5c8b1c804ee8f6f07afedd88814aeb (patch)
treef1021d66c76846e2871348fb5edcb4410dfd2b10 /src/main/java/net/minecraft/server/MinecraftServer.java
parent98633a9f1693b339e8c86e169b6530318ba6442f (diff)
downloadcraftbukkit-0faaf5af8a5c8b1c804ee8f6f07afedd88814aeb.tar
craftbukkit-0faaf5af8a5c8b1c804ee8f6f07afedd88814aeb.tar.gz
craftbukkit-0faaf5af8a5c8b1c804ee8f6f07afedd88814aeb.tar.lz
craftbukkit-0faaf5af8a5c8b1c804ee8f6f07afedd88814aeb.tar.xz
craftbukkit-0faaf5af8a5c8b1c804ee8f6f07afedd88814aeb.zip
Made the movement speed check more reliable on high load servers.
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ce5df414..2acd3f93 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -55,6 +55,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
public OptionSet options;
public ColouredConsoleSender console;
public ConsoleReader reader;
+ public static int currentTick;
// Craftbukkit end
public MinecraftServer(OptionSet options) { // CraftBukkit - adds argument OptionSet
@@ -281,6 +282,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
j = 0L;
} else {
while (j > 50L) {
+ MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
j -= 50L;
this.h();
}