From b140745da278c13de34b6c2934400904bea9d31c Mon Sep 17 00:00:00 2001 From: Monty Date: Wed, 14 Apr 2021 20:31:34 +0200 Subject: [PATCH] Temporarily remove death messages --- server/src/events/entity_manipulation.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index abe983b34d..404cffd4f7 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -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::().get(entity) { - if let Some(uid) = state.ecs().read_storage::().get(entity) { - let kill_source = match cause { + if let Some(_uid) = state.ecs().read_storage::().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(), - )); + ));*/ } }