Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 19:46:21 +01:00
Code Issues Projects Releases Wiki Activity

Fixed another issue involving invalid player positions or movement.

Browse Source
This commit is contained in:
EvilSeph 2011-04-19 01:04:13 -04:00
parent 5e154b2235
commit 0048b22e44
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,24 +252,12 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
} }
} }
if (packet10flying.i) { // Craftbukkit start - better fix for invalid position issues; should be fixed in 1.5
f2 = packet10flying.e;
f3 = packet10flying.f;
}
this.e.a(true);
this.e.bl = 0.0F;
this.e.b(this.i, this.j, this.k, f2, f3);
d4 = d1 - this.e.locX; d4 = d1 - this.e.locX;
double d6 = d2 - this.e.locY; double d6 = d2 - this.e.locY;
double d7 = d3 - this.e.locZ; double d7 = d3 - this.e.locZ;
float f4 = 0.0625F; float f4 = 0.0625F;
// CraftBukkit
boolean flag = this.e.world.a(this.e, this.e.boundingBox.b().e((double) f4, (double) f4, (double) f4)).size() == 0;
this.e.c(d4, d6, d7);
d4 = d1 - this.e.locX;
d6 = d2 - this.e.locY;
if (d6 > -0.5D || d6 < 0.5D) { if (d6 > -0.5D || d6 < 0.5D) {
d6 = 0.0D; d6 = 0.0D;
} }
@ -278,13 +266,36 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
double d8 = d4 * d4 + d6 * d6 + d7 * d7; double d8 = d4 * d4 + d6 * d6 + d7 * d7;
boolean flag1 = false; boolean flag1 = false;
if (d8 > 0.0625D && !this.e.F()) { if (d8 > 6.25D && !this.e.F()) {
flag1 = true; flag1 = true;
a.warning(this.e.name + " moved wrongly!"); a.warning(this.e.name + " was caught moving faster than the maximum allowed speed. Possible malicious activity?");
System.out.println("Got position " + d1 + ", " + d2 + ", " + d3); this.a(this.i, this.j, this.k, f2, f3);
System.out.println("Expected " + this.e.locX + ", " + this.e.locY + ", " + this.e.locZ); return;
} }
this.e.c(d4, d6, d7);
d4 = d1 - this.e.locX;
d6 = d2 - this.e.locY;
if (d6 > -0.5D || d6 < 0.5D) {
d6 = 0.0D;
}
d7 = d3 - this.e.locZ;
if (packet10flying.i) {
f2 = packet10flying.e;
f3 = packet10flying.f;
}
// Craftbukkit end
this.e.a(true);
this.e.bl = 0.0F;
this.e.b(this.i, this.j, this.k, f2, f3);
// CraftBukkit
boolean flag = this.e.world.a(this.e, this.e.boundingBox.b().e((double) f4, (double) f4, (double) f4)).size() == 0;
this.e.b(d1, d2, d3, f2, f3); this.e.b(d1, d2, d3, f2, f3);
// CraftBukkit // CraftBukkit
boolean flag2 = this.e.world.a(this.e, this.e.boundingBox.b().e((double) f4, (double) f4, (double) f4)).size() == 0; boolean flag2 = this.e.world.a(this.e, this.e.boundingBox.b().e((double) f4, (double) f4, (double) f4)).size() == 0;