Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 13:36:16 +01:00
Code Issues Projects Releases Wiki Activity

Made the movement speed check more reliable on high load servers.

Browse Source
This commit is contained in:
EvilSeph 2011-05-09 14:51:01 -04:00
parent 98633a9f16
commit 0faaf5af8a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/MinecraftServer.java
View File

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

9
src/main/java/net/minecraft/server/NetServerHandler.java
View File

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