From ba4a7a9d8550a2b370238282c0f31eef2d4d378c Mon Sep 17 00:00:00 2001
From: ice_iix <ice_ix@protonmail.ch>
Date: Sat, 11 May 2019 14:53:42 -0700
Subject: [PATCH] 1.7.10: Fix player position too high on login. Closes #87

Adds a new TeleportPlayer_NoGround packet, which is subtly different
from TeleportPlayer_NoConfirm. The flags u8 is replaced with an
on_ground bool, but more importantly the Y position is the eyes
position, so we have to translate to feet position for the client.

1.7.10: https://wiki.vg/index.php?title=Protocol&oldid=6003#Player_Position_And_Look
1.8.9: https://wiki.vg/index.php?title=Protocol&oldid=7368#Player_Position_And_Look
---
 src/protocol/packet.rs           | 8 ++++++++
 src/protocol/versions/v1_7_10.rs | 2 +-
 src/server/mod.rs                | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/protocol/packet.rs b/src/protocol/packet.rs
index 21b0615..6fb57e9 100644
--- a/src/protocol/packet.rs
+++ b/src/protocol/packet.rs
@@ -1310,6 +1310,14 @@ state_packets!(
                 field pitch: f32 =,
                 field flags: u8 =,
             }
+            packet TeleportPlayer_OnGround {
+                field x: f64 =,
+                field eyes_y: f64 =,
+                field z: f64 =,
+                field yaw: f32 =,
+                field pitch: f32 =,
+                field on_ground: bool =,
+            }
             /// EntityUsedBed is sent by the server when a player goes to bed.
             packet EntityUsedBed {
                 field entity_id: VarInt =,
diff --git a/src/protocol/versions/v1_7_10.rs b/src/protocol/versions/v1_7_10.rs
index 1bc92ff..c930e42 100644
--- a/src/protocol/versions/v1_7_10.rs
+++ b/src/protocol/versions/v1_7_10.rs
@@ -42,7 +42,7 @@ protocol_packet_ids!(
             0x05 => SpawnPosition_i32
             0x06 => UpdateHealth_u16
             0x07 => Respawn
-            0x08 => TeleportPlayer_NoConfirm
+            0x08 => TeleportPlayer_OnGround
             0x09 => SetCurrentHotbarSlot
             0x0a => EntityUsedBed_i32
             0x0b => Animation
diff --git a/src/server/mod.rs b/src/server/mod.rs
index f6f8cf2..c2f0a55 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -415,6 +415,7 @@ impl Server {
                             MultiBlockChange_u16 => on_multi_block_change_u16,
                             TeleportPlayer_WithConfirm => on_teleport_player_withconfirm,
                             TeleportPlayer_NoConfirm => on_teleport_player_noconfirm,
+                            TeleportPlayer_OnGround => on_teleport_player_onground,
                             TimeUpdate => on_time_update,
                             ChangeGameState => on_game_state_change,
                             UpdateBlockEntity => on_block_entity_update,
@@ -1000,6 +1001,11 @@ impl Server {
         self.on_teleport_player(teleport.x, teleport.y, teleport.z, teleport.yaw as f64, teleport.pitch as f64, teleport.flags, None)
     }
 
+    fn on_teleport_player_onground(&mut self, teleport: packet::play::clientbound::TeleportPlayer_OnGround) {
+        let flags: u8 = 0; // always absolute
+        self.on_teleport_player(teleport.x, teleport.eyes_y - 1.62, teleport.z, teleport.yaw as f64, teleport.pitch as f64, flags, None)
+    }
+
     fn on_teleport_player(&mut self, x: f64, y: f64, z: f64, yaw: f64, pitch: f64, flags: u8, teleport_id: Option<protocol::VarInt>) {
         use std::f64::consts::PI;
         if let Some(player) = self.player {