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

Rebase fixes

Browse Source
This commit is contained in:
tommy 2019-07-21 13:03:06 -04:00
parent 8bac6e1e72
commit ea0bbe7e47
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/msg/server.rs
View File

@ -1,5 +1,10 @@
use super::{ClientState, EcsCompPacket, EcsResPacket}; use super::{ClientState, EcsCompPacket, EcsResPacket};
use crate::{comp, terrain::TerrainChunk, ChatType}; use crate::{
comp,
terrain::{Block, TerrainChunk},
ChatType,
};
use fxhash::FxHashMap;
use vek::*; use vek::*;
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]

14
server/src/cmd.rs
View File

@ -627,7 +627,7 @@ fn handle_tell(server: &mut Server, entity: EcsEntity, args: String, action: &Ch
); );
server.clients.notify( server.clients.notify(
entity, entity,
ServerMsg::tell(format!("You tell {} {}", alias, msg)), ServerMsg::tell(format!("You tell {}:{}", alias, msg)),
); );
} }
None => { None => {
@ -640,20 +640,16 @@ fn handle_tell(server: &mut Server, entity: EcsEntity, args: String, action: &Ch
} else { } else {
server.clients.notify( server.clients.notify(
entity, entity,
ServerMsg::Chat(format!( ServerMsg::chat(format!(
"You really should say something to {}!", "You really should say something to {}!",
alias alias
)), )),
); );
} }
} else { } else {
server.clients.notify( server
entity, .clients
ServerMsg::chat(format!( .notify(entity, ServerMsg::chat(format!("Don't be crazy!")));
"You really should say something to {}!",
alias
)),
);
} }
} }
None => { None => {