Merge branch 'main' of https://github.com/mat-1/azalea into main

2 files changed, 10 insertions, 3 deletions

diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs
index 202cf47c..e127f0d7 100755
--- a/azalea-client/src/chat.rs
+++ b/azalea-client/src/chat.rs
@@ -149,6 +149,7 @@ impl Client {
             entity: self.entity,
             content: content.to_string(),
         });
+        self.run_schedule_sender.send(()).unwrap();
     }
 }
 
@@ -228,9 +229,15 @@ fn handle_send_chat_kind_event(
     mut send_packet_events: EventWriter<SendPacketEvent>,
 ) {
     for event in events.iter() {
+        let content = event
+            .content
+            .chars()
+            .filter(|c| !matches!(c, '\x00'..='\x1F' | '\x7F' | '§'))
+            .take(256)
+            .collect::<String>();
         let packet = match event.kind {
             ChatPacketKind::Message => ServerboundChatPacket {
-                message: event.content.clone(),
+                message: content,
                 timestamp: SystemTime::now()
                     .duration_since(UNIX_EPOCH)
                     .expect("Time shouldn't be before epoch")
@@ -245,7 +252,7 @@ fn handle_send_chat_kind_event(
             ChatPacketKind::Command => {
                 // TODO: chat signing
                 ServerboundChatCommandPacket {
-                    command: event.content.clone(),
+                    command: content,
                     timestamp: SystemTime::now()
                         .duration_since(UNIX_EPOCH)
                         .expect("Time shouldn't be before epoch")
diff --git a/azalea-client/src/get_mc_dir.rs b/azalea-client/src/get_mc_dir.rs
index 440550a7..df2a81aa 100755
--- a/azalea-client/src/get_mc_dir.rs
+++ b/azalea-client/src/get_mc_dir.rs
@@ -23,7 +23,7 @@ pub fn minecraft_dir() -> Option<PathBuf> {
 pub fn home_env_var() -> &'static str {
     #[cfg(target_os = "windows")]
     {
-        "USERPROFILE"
+        "APPDATA"
     }
     #[cfg(target_os = "macos")]
     {