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 '191_player_to_player_dm' into 'master'

Browse Source 
Add "You tell {}" message to sending player, closes #191

Closes #191

See merge request veloren/veloren!341
This commit is contained in:
Forest Anderson 2019-07-17 19:26:48 +00:00
commit 81ca86ad06
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/cmd.rs
View File

@ -449,6 +449,7 @@ fn handle_msg(server: &mut Server, entity: EcsEntity, args: String, action: &Cha
let msg = &args[alias.len()..args.len()];
match opt_player {
Some(player) => {
if player != entity {
if msg.len() > 1 {
let opt_name = ecs
.read_storage::<comp::Player>()
@ -460,6 +461,10 @@ fn handle_msg(server: &mut Server, entity: EcsEntity, args: String, action: &Cha
player,
ServerMsg::Chat(format!("{} tells you:{}", name, msg)),
);
server.clients.notify(
player,
ServerMsg::Chat(format!("You tell {} {}", alias, msg)),
);
}
None => {
server.clients.notify(
@ -477,6 +482,11 @@ fn handle_msg(server: &mut Server, entity: EcsEntity, args: String, action: &Cha
)),
);
}
} else {
server
.clients
.notify(entity, ServerMsg::Chat(format!("Don't be crazy!")));
}
}
None => {
server.clients.notify(