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

cargo fmt

Browse Source
This commit is contained in:
CapsizeGlimmer 2020-06-24 02:29:39 -04:00 committed by Forest Anderson
parent 3d29c3254a
commit 883d9acf30
4 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/src/lib.rs
View File

@ -872,11 +872,7 @@ impl Client {
self.state.ecs_mut().apply_entity_package(entity_package);
},
ServerMsg::DeleteEntity(entity) => {
if self
.state
.read_component_cloned::<Uid>(self.entity)
!= Some(entity)
{
if self.state.read_component_cloned::<Uid>(self.entity) != Some(entity) {
self.state
.ecs_mut()
.delete_entity_and_clear_from_uid_allocator(entity.0);
@ -1034,16 +1030,27 @@ impl Client {
};
let name_of_uid = |uid| {
let ecs = self.state.ecs();
(&ecs.read_storage::<comp::Stats>(), &ecs.read_storage::<Uid>())
.join().find(|(_, u)| u == &uid).map(|(c, _)| c.name.clone())
(
&ecs.read_storage::<comp::Stats>(),
&ecs.read_storage::<Uid>(),
)
.join()
.find(|(_, u)| u == &uid)
.map(|(c, _)| c.name.clone())
};
let message_format = |uid, message, group| {
let alias = alias_of_uid(uid);
let name = if character_name { name_of_uid(uid) } else { None };
let name = if character_name {
name_of_uid(uid)
} else {
None
};
match (group, name) {
(Some(group), None) => format!("({}) [{}]: {}", group, alias, message),
(None, None) => format!("[{}]: {}", alias, message),
(Some(group), Some(name)) => format!("({}) [{}] {}: {}", group, alias, name, message),
(Some(group), Some(name)) => {
format!("({}) [{}] {}: {}", group, alias, name, message)
},
(None, Some(name)) => format!("[{}] {}: {}", alias, name, message),
}
};

20
server/src/cmd.rs
View File

@ -1083,9 +1083,7 @@ fn handle_faction(
let _ = ecs.write_storage().insert(client, mode.clone());
if !msg.is_empty() {
if let Some(uid) = ecs.read_storage().get(client) {
server
.state
.send_chat(mode.new_message(*uid, msg));
server.state.send_chat(mode.new_message(*uid, msg));
}
}
} else {
@ -1117,9 +1115,7 @@ fn handle_group(
let _ = ecs.write_storage().insert(client, mode.clone());
if !msg.is_empty() {
if let Some(uid) = ecs.read_storage().get(client) {
server
.state
.send_chat(mode.new_message(*uid, msg));
server.state.send_chat(mode.new_message(*uid, msg));
}
}
} else {
@ -1153,9 +1149,7 @@ fn handle_region(
.insert(client, mode.clone());
if !msg.is_empty() {
if let Some(uid) = server.state.ecs().read_storage().get(client) {
server
.state
.send_chat(mode.new_message(*uid, msg));
server.state.send_chat(mode.new_message(*uid, msg));
}
}
}
@ -1183,9 +1177,7 @@ fn handle_say(
.insert(client, mode.clone());
if !msg.is_empty() {
if let Some(uid) = server.state.ecs().read_storage().get(client) {
server
.state
.send_chat(mode.new_message(*uid, msg));
server.state.send_chat(mode.new_message(*uid, msg));
}
}
}
@ -1213,9 +1205,7 @@ fn handle_world(
.insert(client, mode.clone());
if !msg.is_empty() {
if let Some(uid) = server.state.ecs().read_storage().get(client) {
server
.state
.send_chat(mode.new_message(*uid, msg));
server.state.send_chat(mode.new_message(*uid, msg));
}
}
}

13
server/src/sys/message.rs
View File

@ -464,13 +464,12 @@ impl<'a> System<'a> for Sys {
// Tell all clients to add them to the player list.
for entity in new_players {
if let (Some(uid), Some(player)) = (uids.get(entity), players.get(entity)) {
let msg =
ServerMsg::PlayerListUpdate(PlayerListUpdate::Add(*uid, PlayerInfo {
player_alias: player.alias.clone(),
is_online: true,
is_admin: admins.get(entity).is_some(),
character: None, // new players will be on character select.
}));
let msg = ServerMsg::PlayerListUpdate(PlayerListUpdate::Add(*uid, PlayerInfo {
player_alias: player.alias.clone(),
is_online: true,
is_admin: admins.get(entity).is_some(),
character: None, // new players will be on character select.
}));
for client in (&mut clients).join().filter(|c| c.is_registered()) {
client.notify(msg.clone())
}

16
voxygen/src/hud/settings_window.rs
View File

@ -1151,12 +1151,16 @@ impl<'a> Widget for SettingsWindow<'a> {
!self.global_state.settings.gameplay.chat_character_name,
));
}
Text::new(&self.localized_strings.get("hud.settings.chat_character_name"))
.right_from(state.ids.chat_char_name_button, 20.0)
.font_size(self.fonts.cyri.scale(14))
.font_id(self.fonts.cyri.conrod_id)
.color(TEXT_COLOR)
.set(state.ids.chat_char_name_text, ui);
Text::new(
&self
.localized_strings
.get("hud.settings.chat_character_name"),
)
.right_from(state.ids.chat_char_name_button, 20.0)
.font_size(self.fonts.cyri.scale(14))
.font_id(self.fonts.cyri.conrod_id)
.color(TEXT_COLOR)
.set(state.ids.chat_char_name_text, ui);
// Language select drop down
Text::new(&self.localized_strings.get("common.languages"))