fall damage bug fixes

Author: cyteon

src/server/state/play.rs

@@ -205,18 +205,6 @@ pub async fn play(socket: EncryptedStream<TcpStream>, player: Player) -> anyhow:
         Arc::clone(&player)
     );
 
-    {
-        let mut player_guard = player.lock().await;
-        player_guard.sync_player_position().await?;
-        player_guard.sync_player_inventory().await?;
-        player_guard.sync_player_health().await?;
-
-        crate::log::log(
-            LogLevel::Debug, 
-            format!("Synchronized intial data for {}", player_guard.username).as_str()
-        );
-    }
-
     {
         let player_guard = player.lock().await;
         let player_clone = player_guard.clone();
@@ -280,6 +268,21 @@ pub async fn play(socket: EncryptedStream<TcpStream>, player: Player) -> anyhow:
         })
     };
 
+    {
+        let mut player_guard = player.lock().await;
+        player_guard.sync_player_position().await?;
+        player_guard.sync_player_inventory().await?;
+        player_guard.sync_player_health().await?;
+
+        crate::log::log(
+            LogLevel::Debug, 
+            format!("Synchronized intial data for {}", player_guard.username).as_str()
+        );
+
+        player_guard.send_system_message(format!("This server is running Mist {}", env!("CARGO_PKG_VERSION"))).await?;
+        player_guard.send_system_message("Please report any bugs at https://github.com/cyteon/mist/issues/new".to_string()).await?;
+    }
+
     loop {
         match timeout(Duration::from_secs(30), read_packet(&mut read, &ProtocolState::Play, true)).await {
             Ok(Ok(Some(packet))) => {

src/types/player.rs

@@ -53,7 +53,7 @@ pub struct Player {
     pub hunger: i32,
     pub saturation: f32,
     pub dead: bool,
-    pub ignore_fall_for_ticks: i32,
+    pub ignore_fall_for_ticks: u32,
 
     pub shared_secret: Option<Vec<u8>>,
     pub textures: Option<String>,
@@ -229,7 +229,9 @@ impl Player {
         send_sync_player_position(&mut buffer, self).await?;
         let _ = tx.send(buffer);
 
-        self.ignore_fall_for_ticks = 2;
+        self.fall_distance = 0.0;
+        self.server_vy = 0.0;
+        self.ignore_fall_for_ticks = 100;
 
         Ok(())
     }
@@ -364,13 +366,13 @@ impl Player {
         self.vx = 0.0;
         self.vy = 0.0;
         self.vz = 0.0;
+        self.server_vy = 0.0;
 
         self.yaw = 0.0;
         self.pitch = 0.0;
 
         self.dead = false;
         self.chunks_loaded = false;
-        self.ignore_fall_for_ticks = 5;
 
         self.sync_player_health().await?;
         self.sync_player_position().await?;
@@ -379,7 +381,7 @@ impl Player {
     }
 
     pub async fn tick(&mut self) -> anyhow::Result<()> {
-        if self.dead {
+        if self.dead || !self.initial_sync_done {
             return Ok(());
         }
 
@@ -436,6 +438,8 @@ impl Player {
         self.y += self.vy;
         self.z += self.vz;
 
+        println!("Server vy: {}, fall distance: {}, on_ground: {}, flying: {}, ignore_fall_for_ticks: {}", self.server_vy, self.fall_distance, self.on_ground, self.flying, self.ignore_fall_for_ticks);
+
         if !self.on_ground && !self.flying {
             if self.movement.jumping && !self.jump_applied {
                 self.server_vy = 0.42;
@@ -472,6 +476,11 @@ impl Player {
 
         self.ignore_fall_for_ticks = self.ignore_fall_for_ticks.saturating_sub(1);
 
+        if self.ignore_fall_for_ticks > 0 {
+            self.fall_distance = 0.0;
+            self.server_vy = 0.0;
+        }
+
         if !self.chunks_loaded {
             return Ok(());
         }