From 518acaa27a4a6d19d1c44d59c4c79a4507bf90f0 Mon Sep 17 00:00:00 2001 From: stickz Date: Thu, 14 Apr 2016 22:24:28 -0400 Subject: [PATCH 1/2] Fix Chat Gags This feature gets the client's NW boolean value for being gagged from ulx. If they are gagged, it will properly block them from chatting. --- .../gamemodes/morbusgame/gamemode/server/sv_chat.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MorbusGamemode/gamemodes/morbusgame/gamemode/server/sv_chat.lua b/MorbusGamemode/gamemodes/morbusgame/gamemode/server/sv_chat.lua index 0fd8ac7..ef1acb3 100644 --- a/MorbusGamemode/gamemodes/morbusgame/gamemode/server/sv_chat.lua +++ b/MorbusGamemode/gamemodes/morbusgame/gamemode/server/sv_chat.lua @@ -67,6 +67,11 @@ end function GM:PlayerSay(ply, text, to_all) -- Shitty chat shit --ToDo: REDO THIS if not ValidEntity(ply) then return end + + --check ulx if the client is gagged and block chatting + --assume the client isn't gaged if ulx isn't present + if ply:GetNWBool("ulx_gagged", false) then return "" end + if ply.Gagged then return "" end -- for later use to_all = !to_all From 1206aa26212d017d4ff0028d6ca6e7dd54d1bf23 Mon Sep 17 00:00:00 2001 From: stickz Date: Fri, 29 Apr 2016 21:43:12 -0400 Subject: [PATCH 2/2] Fix Microphone Muting --- .../gamemodes/morbusgame/gamemode/server/sv_chat.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MorbusGamemode/gamemodes/morbusgame/gamemode/server/sv_chat.lua b/MorbusGamemode/gamemodes/morbusgame/gamemode/server/sv_chat.lua index ef1acb3..fa283a1 100644 --- a/MorbusGamemode/gamemodes/morbusgame/gamemode/server/sv_chat.lua +++ b/MorbusGamemode/gamemodes/morbusgame/gamemode/server/sv_chat.lua @@ -217,8 +217,10 @@ function MuteForRestart(state) end function GM:PlayerCanHearPlayersVoice(listener, speaker) - - if mute_all then + + -- If mute all clients or the client is muted from ulx + -- Notice: returns false if ulx nw boolean is not present + if (mute_all || speaker:GetNWBool("ulx_muted", false)) then return false,false end