fix merge

CCBlueX · Jan 6, 2024 · 994136c · 994136c
1 parent 7890341
commit 994136c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/azalea-client/src/events.rs b/azalea-client/src/events.rs
@@ -27,7 +27,7 @@ use crate::{
         AddPlayerEvent, DeathEvent, KeepAliveEvent, PacketEvent, RemovePlayerEvent,
         UpdatePlayerEvent,
     },
-    PlayerInfo, disconnect::DisconnectEvent,
+    PlayerInfo,
 };
 
 // (for contributors):
@@ -233,11 +233,3 @@ fn disconnect_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader
         }
     }
 }
-
-fn disconnect_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<DisconnectEvent>) {
-    for event in events.read() {
-        if let Ok(local_player_events) = query.get(event.entity) {
-            let _ = local_player_events.send(Event::Disconnect(event.reason.clone()));
-        }
-    }
-}
diff --git a/azalea-client/src/packet_handling/configuration.rs b/azalea-client/src/packet_handling/configuration.rs
@@ -1,6 +1,8 @@
 use std::io::Cursor;
 use std::sync::Arc;
 
+use azalea_chat::FormattedText;
+use azalea_chat::text_component::TextComponent;
 use azalea_entity::indexing::EntityIdIndex;
 use azalea_protocol::packets::configuration::serverbound_finish_configuration_packet::ServerboundFinishConfigurationPacket;
 use azalea_protocol::packets::configuration::serverbound_keep_alive_packet::ServerboundKeepAlivePacket;
@@ -115,7 +117,7 @@ pub fn process_packet_events(ecs: &mut World) {
                     let mut disconnect_events = system_state.get_mut(ecs);
                     disconnect_events.send(DisconnectEvent {
                         entity: player_entity,
-                        reason: Some(reason),
+                        reason: Some(FormattedText::Text(TextComponent::new(reason))),
                     });
                 }
             }

diff --git a/azalea-client/src/packet_handling/game.rs b/azalea-client/src/packet_handling/game.rs
@@ -406,11 +406,7 @@ pub fn process_packet_events(ecs: &mut World) {
                 let mut disconnect_events = system_state.get_mut(ecs);
                 disconnect_events.send(DisconnectEvent {
                     entity: player_entity,
-<<<<<<< HEAD
-                    reason: Some(p.reason.to_ansi()),
-=======
                     reason: Some(p.reason.clone()),
->>>>>>> socks5
                 });
             }
             ClientboundGamePacket::UpdateRecipes(_p) => {