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

fix #562 Confusing chat alias

Browse Source
This commit is contained in:
scott-c 2020-05-19 19:46:06 +08:00
parent c4cd2f5283
commit 288c7cdbfa
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,10 +408,12 @@ impl<'a> System<'a> for Sys {
let _ = speech_bubbles.insert(entity, bubble);
match players.get(entity) {
Some(player) => {
let stat =
stats.get(entity).expect("Expected stat.name for player");
if admins.get(entity).is_some() {
format!("[ADMIN][{}] {}", &player.alias, message)
format!("[ADMIN][{}] {}", &stat.name, message)
} else {
format!("[{}] {}", &player.alias, message)
format!("[{}] {}", &stat.name, message)
}
},
None => format!("[<Unknown>] {}", message),

17
voxygen/src/hud/social.rs
View File

@ -193,12 +193,17 @@ impl<'a> Widget for Social<'a> {
.color(TEXT_COLOR)
.set(ids.online_title, ui);
for (i, (_, player_alias)) in self.client.player_list.iter().enumerate() {
Text::new(player_alias)
.down(3.0)
.font_size(self.fonts.cyri.scale(15))
.font_id(self.fonts.cyri.conrod_id)
.color(TEXT_COLOR)
.set(ids.player_names[i], ui);
Text::new(&format!(
"({}) {} Lvl {}",
player_alias,
self.client.character_list.characters[i].character.alias,
self.client.character_list.characters[i].level
))
.down(3.0)
.font_size(self.fonts.cyri.scale(15))
.font_id(self.fonts.cyri.conrod_id)
.color(TEXT_COLOR)
.set(ids.player_names[i], ui);
}
}