Merge branch 'capucho/voxygen-logout-timeout' of gitlab.com:veloren/veloren into capucho/voxygen-logout-timeout

Fixed conflicts
2024-08-30 18:12:32 +00:00 · 2020-03-10 21:06:08 +00:00 · 2020-03-10 21:06:08 +00:00 · 339965f6ad
commit 339965f6ad
parent a9580a81bc a391f2e0f2
1 changed files with 3 additions and 0 deletions
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@ -287,6 +287,9 @@ impl<'a> System<'a> for Sys {
                    ClientMsg::Terminate => {
                        server_emitter.emit(ServerEvent::ClientDisconnect(entity));
                    },
+                    ClientMsg::Terminate => {
+                        server_emitter.emit(ServerEvent::ClientDisconnect(entity));
+                    },
                }
            }
        }