From 2d832bf14886a751cc535ec4a7d247b73e685d41 Mon Sep 17 00:00:00 2001
From: Travis Watkins <amaranth@ubuntu.com>
Date: Sat, 17 Nov 2012 10:19:41 -0600
Subject: [PATCH] Don't kick player when they travel too far. Fixes BUKKIT-2968
If a player travels past 32,000,000 blocks on the X or Z coordinates they
will be kicked for having an illegal position. On kick their player data
is saved which includes their (illegal) position. This means on join they
are immediately kicked again for the same reason and are stuck. Instead of
kicking at all in this case just teleport the player back to their previous
position just like the moved wrongly check does.
---
src/main/java/net/minecraft/server/NetServerHandler.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index a6e6403107..004ef08ab2 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -336,7 +336,8 @@ public class NetServerHandler extends NetHandler {
}
if (Math.abs(packet10flying.x) > 3.2E7D || Math.abs(packet10flying.z) > 3.2E7D) {
- this.disconnect("Illegal position");
+ // CraftBukkit - teleport to previous position instead of kicking, players get stuck
+ this.a(this.y, this.z, this.q, this.player.yaw, this.player.pitch);
return;
}
}