send ServerboundPlayerLoaded on join and respawn

2 files changed, 7 insertions, 4 deletions

diff --git a/azalea-client/src/plugins/packet/game/events.rs b/azalea-client/src/plugins/packet/game/events.rs
index 7134a2f2..e341db3e 100644
--- a/azalea-client/src/plugins/packet/game/events.rs
+++ b/azalea-client/src/plugins/packet/game/events.rs
@@ -57,7 +57,6 @@ pub fn handle_outgoing_packets_observer(
     mut query: Query<(&mut RawConnection, Option<&InGameState>)>,
 ) {
     let event = trigger.event();
-    trace!("Sending game packet: {:?}", event.packet);
 
     if let Ok((mut raw_connection, in_game_state)) = query.get_mut(event.sent_by) {
         if in_game_state.is_none() {
@@ -68,10 +67,12 @@ pub fn handle_outgoing_packets_observer(
             return;
         }
 
-        // debug!("Sending game packet: {:?}", event.packet);
+        trace!("Sending game packet: {:?}", event.packet);
         if let Err(e) = raw_connection.write(event.packet.clone()) {
             error!("Failed to send packet: {e}");
         }
+    } else {
+        trace!("Not sending game packet: {:?}", event.packet);
     }
 }
 
diff --git a/azalea-client/src/plugins/packet/game/mod.rs b/azalea-client/src/plugins/packet/game/mod.rs
index 63c1bafa..670058c3 100644
--- a/azalea-client/src/plugins/packet/game/mod.rs
+++ b/azalea-client/src/plugins/packet/game/mod.rs
@@ -29,6 +29,7 @@ use crate::{
     inventory::{
         ClientSideCloseContainerEvent, Inventory, MenuOpenedEvent, SetContainerContentEvent,
     },
+    loading::HasClientLoaded,
     local_player::{Hunger, InstanceHolder, LocalGameMode, PlayerAbilities, TabList},
     movement::{KnockbackEvent, KnockbackType},
     packet::as_system,
@@ -1490,8 +1491,9 @@ impl GamePacketHandler<'_> {
                     entity_bundle,
                 ));
 
-                // Remove the Dead marker component from the player.
-                commands.entity(self.player).remove::<Dead>();
+                commands
+                    .entity(self.player)
+                    .remove::<(Dead, HasClientLoaded)>();
             },
         )
     }