3 files changed, 11 insertions, 6 deletions
diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs
index 38e36b63..fcb624b4 100644
--- a/azalea-client/src/client.rs
+++ b/azalea-client/src/client.rs
@@ -11,7 +11,7 @@ use azalea_protocol::{
             serverbound_accept_teleportation_packet::ServerboundAcceptTeleportationPacket,
             serverbound_custom_payload_packet::ServerboundCustomPayloadPacket,
             serverbound_keep_alive_packet::ServerboundKeepAlivePacket,
-            serverbound_move_player_packet_pos_rot::ServerboundMovePlayerPacketPosRot,
+            serverbound_move_player_pos_rot_packet::ServerboundMovePlayerPacketPosRot,
             ClientboundGamePacket, ServerboundGamePacket,
         },
         handshake::client_intention_packet::ClientIntentionPacket,
@@ -339,7 +339,7 @@ impl Client {
             ClientboundGamePacket::ClientboundChangeDifficultyPacket(p) => {
                 println!("Got difficulty packet {:?}", p);
             }
-            ClientboundGamePacket::ClientboundDeclareCommandsPacket(_p) => {
+            ClientboundGamePacket::ClientboundCommandsPacket(_p) => {
                 println!("Got declare commands packet");
             }
             ClientboundGamePacket::ClientboundPlayerAbilitiesPacket(p) => {
@@ -562,7 +562,7 @@ impl Client {
                     .move_entity_with_delta(p.entity_id, &p.delta)
                     .map_err(|e| HandleError::Other(e.into()))?;
             }
-            ClientboundGamePacket::ClientboundMoveEntityPosrotPacket(p) => {
+            ClientboundGamePacket::ClientboundMoveEntityPosRotPacket(p) => {
                 let mut dimension_lock = client.dimension.lock()?;
                 let dimension = dimension_lock.as_mut().unwrap();
 
diff --git a/azalea-client/src/movement.rs b/azalea-client/src/movement.rs
index bc48e1b2..5f9533be 100644
--- a/azalea-client/src/movement.rs
+++ b/azalea-client/src/movement.rs
@@ -1,6 +1,6 @@
 use crate::Client;
 use azalea_core::EntityPos;
-use azalea_protocol::packets::game::serverbound_move_player_packet_pos_rot::ServerboundMovePlayerPacketPosRot;
+use azalea_protocol::packets::game::serverbound_move_player_pos_rot_packet::ServerboundMovePlayerPacketPosRot;
 use azalea_world::MoveEntityError;
 use thiserror::Error;
 
diff --git a/azalea-client/src/ping.rs b/azalea-client/src/ping.rs
index 303fae74..e4872881 100755
--- a/azalea-client/src/ping.rs
+++ b/azalea-client/src/ping.rs
@@ -52,7 +52,12 @@ pub async fn ping_server(
 
     let packet = conn.read().await?;
 
-    match packet {
-        ClientboundStatusPacket::ClientboundStatusResponsePacket(p) => Ok(p),
+    loop {
+        match packet {
+            ClientboundStatusPacket::ClientboundStatusResponsePacket(p) => return Ok(p),
+            ClientboundStatusPacket::ClientboundPongResponsePacket(_) => {
+                // we should never get this packet since we didn't send a ping
+            }
+        }
     }
 }