summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorEvilSeph <evilseph@unaligned.org>2011-05-19 01:15:51 -0400
committerEvilSeph <evilseph@unaligned.org>2011-05-19 01:15:51 -0400
commit962f05821b6891227748b6361d80b34cdd994d66 (patch)
tree164204ec77034469b29bfd5161bf4c69188553bb /src/main
parentafb08bb0c5922f77883e297b3d2478827a7a21e9 (diff)
downloadcraftbukkit-962f05821b6891227748b6361d80b34cdd994d66.tar
craftbukkit-962f05821b6891227748b6361d80b34cdd994d66.tar.gz
craftbukkit-962f05821b6891227748b6361d80b34cdd994d66.tar.lz
craftbukkit-962f05821b6891227748b6361d80b34cdd994d66.tar.xz
craftbukkit-962f05821b6891227748b6361d80b34cdd994d66.zip
Minimal diffs.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 6f484058..a63b4c97 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -280,10 +280,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
// CraftBukkit start - make the movement speed check behave properly under tick degradation.
int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
- if (elapsedTicks < 0) { // We should account for time drifting backwards
- elapsedTicks = 1;
- }
- if (d8 > 100.0D * (elapsedTicks == 0 ? 1 : elapsedTicks)) {
+ if (d8 > 100.0D * (elapsedTicks <= 0 ? 1 : elapsedTicks)) {
a.warning(this.player.name + " moved too quickly! Elapsed ticks: " + (elapsedTicks == 0 ? 1 : elapsedTicks) + ", Distance change: " + d8);
this.disconnect("You moved too quickly :( (Hacking?)");
return;