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 'pfau/temp_disable_death_msg' into 'master'

Browse Source 
Temporarily remove death messages

See merge request veloren/veloren!2124
This commit is contained in:
Samuel Keiffer 2021-04-14 20:45:54 +00:00
commit e6f10e5176
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/events/entity_manipulation.rs
View File

@ -130,8 +130,8 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
// Chat message
// If it was a player that died
if let Some(_player) = state.ecs().read_storage::<Player>().get(entity) {
if let Some(uid) = state.ecs().read_storage::<Uid>().get(entity) {
let kill_source = match cause {
if let Some(_uid) = state.ecs().read_storage::<Uid>().get(entity) {
let _kill_source = match cause {
HealthSource::Damage {
kind: DamageSource::Melee,
by: Some(by),
@ -169,10 +169,13 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
| HealthSource::Heal { by: _ }
| HealthSource::Unknown => KillSource::Other,
};
state.notify_players(ServerGeneral::server_msg(
// TODO Reactivate and only show death messages for group members
// and players within close range (e.g. same range as /say) to avoid
// chat spamming
/*state.notify_players(ServerGeneral::server_msg(
comp::ChatType::Kill(kill_source, *uid),
"".to_string(),
));
));*/
}
}