diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-01-12 15:27:39 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-01-12 15:27:39 +0000 |
commit | 897551e39e0e24812acc0704e963d347dfa4a8ef (patch) | |
tree | 1a85a0768d56b78fc438f182ebfecabc584d6548 /src/main/java/net/minecraft/server/NetServerHandler.java | |
parent | 7f079a0cd6c87cf6360a0ed86592f88d374ba268 (diff) | |
download | craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.tar craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.tar.gz craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.tar.lz craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.tar.xz craftbukkit-897551e39e0e24812acc0704e963d347dfa4a8ef.zip |
Update to mc-dev rename revision 01
Diffstat (limited to 'src/main/java/net/minecraft/server/NetServerHandler.java')
-rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 396d68cb..4f0a22c2 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -323,7 +323,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener { } float f4 = 0.0625F; - boolean flag = worldserver.getEntities(this.player, this.player.boundingBox.clone().shrink((double) f4, (double) f4, (double) f4)).size() == 0; + boolean flag = worldserver.a(this.player, this.player.boundingBox.clone().shrink((double) f4, (double) f4, (double) f4)).size() == 0; if (this.player.onGround && !packet10flying.g && d6 > 0.0D) { this.player.c(0.2F); @@ -352,14 +352,14 @@ public class NetServerHandler extends NetHandler implements ICommandListener { } this.player.setLocation(d1, d2, d3, f2, f3); - boolean flag2 = worldserver.getEntities(this.player, this.player.boundingBox.clone().shrink((double) f4, (double) f4, (double) f4)).size() == 0; + boolean flag2 = worldserver.a(this.player, this.player.boundingBox.clone().shrink((double) f4, (double) f4, (double) f4)).size() == 0; if (flag && (flag1 || !flag2) && !this.player.isSleeping()) { this.a(this.x, this.y, this.z, f2, f3); return; } - AxisAlignedBB axisalignedbb = this.player.boundingBox.clone().b((double) f4, (double) f4, (double) f4).a(0.0D, -0.55D, 0.0D); + AxisAlignedBB axisalignedbb = this.player.boundingBox.clone().grow((double) f4, (double) f4, (double) f4).a(0.0D, -0.55D, 0.0D); if (!this.minecraftServer.allowFlight && !this.player.itemInWorldManager.b() && !worldserver.b(axisalignedbb)) { if (d9 >= -0.03125D) { @@ -1086,7 +1086,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener { if (packet0keepalive.a == this.i) { int i = (int) (System.nanoTime() / 1000000L - this.j); - this.player.i = (this.player.i * 3 + i) / 4; + this.player.ping = (this.player.ping * 3 + i) / 4; } } |