diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/NetServerHandler.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index d314c7c0..84a04d09 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -38,6 +38,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener { private double z; private boolean m = true; private Map n = new HashMap(); + private int lastTick = MinecraftServer.currentTick; // CraftBukkit public NetServerHandler(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) { this.minecraftServer = minecraftserver; @@ -277,11 +278,15 @@ public class NetServerHandler extends NetHandler implements ICommandListener { double d7 = d3 - this.player.locZ; double d8 = d4 * d4 + d6 * d6 + d7 * d7; - if (d8 > 100.0D) { - a.warning(this.player.name + " moved too quickly!"); + // CraftBukkit start - make the movement speed check behave properly under tick degradation. + int elapsedTicks = MinecraftServer.currentTick - this.lastTick; + 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; } + this.lastTick = MinecraftServer.currentTick; + // CraftBukkit end float f4 = 0.0625F; // CraftBukkit |