From c729d7abde7773df1bd88ce8d2c064ec5a3ae77f Mon Sep 17 00:00:00 2001 From: NiLSPACE Date: Thu, 11 Mar 2021 22:26:35 +0100 Subject: Fixed some death messages showing up even when they are disabled. (#5153) --- src/Broadcaster.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/Broadcaster.cpp') diff --git a/src/Broadcaster.cpp b/src/Broadcaster.cpp index c8d2de615..1e9f9b876 100644 --- a/src/Broadcaster.cpp +++ b/src/Broadcaster.cpp @@ -186,6 +186,11 @@ void cWorld::BroadcastBossBarUpdateHealth(const cEntity & a_Entity, UInt32 a_Uni void cWorld::BroadcastChat(const AString & a_Message, const cClientHandle * a_Exclude, eMessageType a_ChatPrefix) { + if ((a_ChatPrefix == mtDeath) && !ShouldBroadcastDeathMessages()) + { + return; + } + ForClientsInWorld(*this, a_Exclude, [&](cClientHandle & a_Client) { a_Client.SendChat(a_Message, a_ChatPrefix); -- cgit v1.2.3