Skip to content

Commit bf9594a

Browse files
committed
fix: #514
1 parent a7b7a53 commit bf9594a

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

crates/hyperion-proxy/src/player.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ pub fn initiate_player_connection(
6767
)
6868
.unwrap();
6969

70-
server_sender.send(connect).await.unwrap();
70+
if let Err(e) = server_sender.send(connect).await {
71+
warn!("failed to send player connect to server: {e}");
72+
return;
73+
}
7174

7275
let mut arena = Arena::new();
7376

@@ -158,7 +161,9 @@ pub fn initiate_player_connection(
158161
}),
159162
).unwrap();
160163

161-
server_sender.send(disconnect).await.unwrap();
164+
if let Err(e) = server_sender.send(disconnect).await {
165+
warn!("failed to send player disconnect to server: {e}");
166+
}
162167
},
163168
_ = &mut packet_reader_task => {
164169
info!("Player disconnected because reader task finished: {player_id:?}");
@@ -171,7 +176,9 @@ pub fn initiate_player_connection(
171176
reason: PlayerDisconnectReason::LostConnection,
172177
})).unwrap();
173178

174-
server_sender.send(disconnect).await.unwrap();
179+
if let Err(e) = server_sender.send(disconnect).await {
180+
warn!("failed to send player disconnect to server: {e}");
181+
}
175182

176183
let map_ref = player_registry.pin();
177184
map_ref.remove(&player_id);

crates/hyperion-proxy/src/server_sender.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::io::IoSlice;
22

33
use rkyv::util::AlignedVec;
4-
use tracing::{trace_span, Instrument};
4+
use tracing::{trace_span, warn, Instrument};
55

66
use crate::util::AsyncWriteVectoredExt;
77

@@ -48,7 +48,10 @@ pub fn launch_server_writer(mut write: tokio::net::tcp::OwnedWriteHalf) -> Serve
4848
io_slices.push(msg);
4949
}
5050

51-
write.write_vectored_all(&mut io_slices).await.unwrap();
51+
if let Err(e) = write.write_vectored_all(&mut io_slices).await {
52+
warn!("failed to write to server: {e}");
53+
return;
54+
}
5255

5356
lengths.clear();
5457
messages.clear();

0 commit comments

Comments
 (0)