Merge branch 'timo-char-weapon-fix' into 'master'

fix: character now spawns with a weapon again

See merge request veloren/veloren!629
This commit is contained in:
Timo Koesters 2019-10-25 11:42:31 +00:00
commit 0fe206ffd1

View File

@ -1,7 +1,6 @@
use super::SysTimer;
use crate::{auth_provider::AuthProvider, client::Client, CLIENT_TIMEOUT};
use common::{
assets,
comp::{Admin, Body, CanBuild, Controller, Ori, Player, Pos, Vel},
event::{EventBus, ServerEvent},
msg::{validate_chat_msg, ChatMsgValidationError, MAX_BYTES_CHAT_MSG},
@ -169,8 +168,7 @@ impl<'a> System<'a> for Sys {
entity,
name,
body,
main: main
.and_then(|specifier| assets::load_cloned(&specifier).ok()),
main,
});
}
ClientState::Character => client.error_state(RequestStateError::Already),