diff options
| author | Kapten Z∅∅m <55669224+default-username-852@users.noreply.github.com> | 2021-01-04 22:46:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-04 22:46:58 +0100 |
| commit | 50b322f4ef974765a2948dfb08b1c9e8128b1bed (patch) | |
| tree | 88d41a434b3a0c242ac7b35c6afefff0f75ee656 /mumd/src/network/tcp.rs | |
| parent | 1af9b90133a8d6102a09102bbd6f726f598c24fc (diff) | |
| parent | be7748be2f1e9d1e88ebd093da9eec16d1ad4049 (diff) | |
| download | mum-50b322f4ef974765a2948dfb08b1c9e8128b1bed.tar.gz | |
Merge branch 'main' into noise-gate
Diffstat (limited to 'mumd/src/network/tcp.rs')
| -rw-r--r-- | mumd/src/network/tcp.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs index 3c96ee1..47ea311 100644 --- a/mumd/src/network/tcp.rs +++ b/mumd/src/network/tcp.rs @@ -44,6 +44,7 @@ pub async fn handle( state: Arc<Mutex<State>>, mut connection_info_receiver: watch::Receiver<Option<ConnectionInfo>>, crypt_state_sender: mpsc::Sender<ClientCryptState>, + packet_sender: mpsc::UnboundedSender<ControlPacket<Serverbound>>, mut packet_receiver: mpsc::UnboundedReceiver<ControlPacket<Serverbound>>, mut tcp_event_register_receiver: mpsc::UnboundedReceiver<(TcpEvent, TcpEventCallback)>, ) { @@ -67,14 +68,13 @@ pub async fn handle( let state_lock = state.lock().unwrap(); authenticate(&mut sink, state_lock.username().unwrap().to_string()).await; let phase_watcher = state_lock.phase_receiver(); - let packet_sender = state_lock.packet_sender(); drop(state_lock); let event_queue = Arc::new(Mutex::new(HashMap::new())); info!("Logging in..."); join!( - send_pings(packet_sender, 10, phase_watcher.clone()), + send_pings(packet_sender.clone(), 10, phase_watcher.clone()), listen( Arc::clone(&state), stream, |