Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'timo-fix-join' into 'master'

Browse Source 
Timo fix join

See merge request veloren/veloren!240
This commit is contained in:
Marcel 2019-06-17 19:30:41 +00:00
commit 99f248529c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/lib.rs
View File

@ -15,7 +15,7 @@ use common::{
terrain::{chonk::ChonkMetrics, TerrainChunk, TerrainChunkSize},
vol::VolSize,
};
use log::{debug, info, log_enabled};
use log::{info, log_enabled, warn};
use std::{
collections::HashMap,
net::SocketAddr,
@ -201,8 +201,10 @@ impl Client {
// 1) Handle input from frontend.
// Pass character actions from frontend input to the player's entity.
self.state.write_component(self.entity, controller.clone());
self.postbox.send_message(ClientMsg::Controller(controller));
if let ClientState::Character | ClientState::Dead = self.client_state {
self.state.write_component(self.entity, controller.clone());
self.postbox.send_message(ClientMsg::Controller(controller));
}
// 2) Build up a list of events for this frame, to be passed to the frontend.
let mut frontend_events = Vec::new();
@ -369,8 +371,7 @@ impl Client {
self.client_state = state;
}
ServerMsg::StateAnswer(Err((error, state))) => {
debug!("{:?}", error);
self.client_state = state;
warn!("{:?}", error);
}
ServerMsg::ForceState(state) => {
self.client_state = state;