aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/network/tcp.rs
diff options
context:
space:
mode:
authorEskil <eskilq@kth.se>2020-11-21 15:56:27 +0100
committerEskil <eskilq@kth.se>2020-11-21 15:56:27 +0100
commit08397f89fd6fdefed67533bf9403bde07f1ee40e (patch)
tree731613e6e00d66e7d35e782a1171677388c83306 /mumd/src/network/tcp.rs
parentff9a37af7ddf5484bb7db61ae01f8aafd9d1e91d (diff)
parentbe4d273fa8778ec87ad4a34502d0f3c75657fbbc (diff)
downloadmum-08397f89fd6fdefed67533bf9403bde07f1ee40e.tar.gz
Merge branch 'sound-effect' into 'main'
Sound effects on events Closes #68 See merge request gustav/mum!32
Diffstat (limited to 'mumd/src/network/tcp.rs')
-rw-r--r--mumd/src/network/tcp.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/mumd/src/network/tcp.rs b/mumd/src/network/tcp.rs
index 131f066..2a0d01e 100644
--- a/mumd/src/network/tcp.rs
+++ b/mumd/src/network/tcp.rs
@@ -247,13 +247,7 @@ async fn listen(
warn!("Login rejected: {:?}", msg);
}
ControlPacket::UserState(msg) => {
- let mut state = state.lock().unwrap();
- if *state.phase_receiver().borrow() == StatePhase::Connecting {
- state.audio_mut().add_client(msg.get_session());
- state.parse_user_state(*msg);
- } else {
- state.parse_user_state(*msg);
- }
+ state.lock().unwrap().parse_user_state(*msg);
}
ControlPacket::UserRemove(msg) => {
state.lock().unwrap().remove_client(*msg);