diff --git a/src/minecraft/net/minecraft/src/CommandServerTp.java b/src/minecraft/net/minecraft/src/CommandServerTp.java
index be9699e..4599c80 100644
--- a/src/minecraft/net/minecraft/src/CommandServerTp.java
+++ b/src/minecraft/net/minecraft/src/CommandServerTp.java
@@ -1,6 +1,8 @@
 package net.minecraft.src;
 
 import org.mcmodule.math.BigInteger;
+
+import java.math.BigDecimal;
 import java.util.List;
 import net.minecraft.server.MinecraftServer;
 
@@ -58,12 +60,12 @@ public class CommandServerTp extends CommandBase
             }
             else if (var4.worldObj != null)
             {
-                 int var5 = par2ArrayOfStr.length - 3;
+                int var5 = par2ArrayOfStr.length - 3;
                 int var6 = 30000000;
                 BigInteger var7 = parseBigInt(par1ICommandSender, par2ArrayOfStr[var5++]);
                 int var8 = parseIntBounded(par1ICommandSender, par2ArrayOfStr[var5++], 0, 256);
                 BigInteger var9 = parseBigInt(par1ICommandSender, par2ArrayOfStr[var5++]);
-                var4.setPositionAndUpdate((double)(var7.doubleValue() + 0.5D), (double)var8, (double)(var9.doubleValue() + 0.5D));
+                var4.serverForThisPlayer.setPlayerLocation(MathHelper.toBigDecimal(var7).add(BigDecimal.valueOf(0.5)), (double)var8, MathHelper.toBigDecimal(var9).add(BigDecimal.valueOf(0.5)), var4.rotationYaw, var4.rotationPitch);
                 notifyAdmins(par1ICommandSender, "commands.tp.coordinates", new Object[] {var4.getEntityName(), var7.toString(), Integer.valueOf(var8), var9.toString()});
             }
         }
diff --git a/src/minecraft/net/minecraft/src/GuiIngame.java b/src/minecraft/net/minecraft/src/GuiIngame.java
index b383a83..fdbf118 100644
--- a/src/minecraft/net/minecraft/src/GuiIngame.java
+++ b/src/minecraft/net/minecraft/src/GuiIngame.java
@@ -412,9 +412,9 @@ public class GuiIngame extends Gui
             var8.drawStringWithShadow(this.mc.extraDebug, 2, 52, 16777215);
             this.drawString(var8, var45, var6 - var8.getStringWidth(var45) - 2, 12, 14737632);
             GL11.glTranslated(0, var8.FONT_HEIGHT, 0);
-            this.drawString(var8, String.format("x: %s", mc.thePlayer.posXBig.setScale(5, RoundingMode.CEILING).toPlainString()), 2, 64, 14737632);
+            this.drawString(var8, String.format("x: %s", mc.thePlayer.posXBig.setScale(5, RoundingMode.HALF_DOWN).toPlainString()), 2, 64, 14737632);
             this.drawString(var8, String.format("y: %.3f (feet pos, %.3f eyes pos)", new Object[] {Double.valueOf(this.mc.thePlayer.boundingBox.minY), Double.valueOf(this.mc.thePlayer.posY)}), 2, 72, 14737632);
-            this.drawString(var8, String.format("z: %s", mc.thePlayer.posZBig.setScale(5, RoundingMode.CEILING).toPlainString()), 2, 80, 14737632);
+            this.drawString(var8, String.format("z: %s", mc.thePlayer.posZBig.setScale(5, RoundingMode.HALF_DOWN).toPlainString()), 2, 80, 14737632);
             this.drawString(var8, "f: " + (MathHelper.floor_double((double)(this.mc.thePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3), 2, 88, 14737632);
             BigInteger x = MathHelper.floor_double_BigInteger(this.mc.thePlayer.posX);
             var22 = MathHelper.floor_double(this.mc.thePlayer.posY);