Merge pull request #701 from FIr3baL/FB_ByPass_RingCommand_InGame

bypass command buffering for command RING
beyond-all-reason · Jun 6, 2024 · 3e0b5b4 · 3e0b5b4
2 parents 6597c0d + ebf91af
commit 3e0b5b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/LuaMenu/widgets/api_command_buffering.lua b/LuaMenu/widgets/api_command_buffering.lua
@@ -19,6 +19,7 @@ end
 
 local bufferBypass = {
 	Ping = true,
+	RING = true,
 	--[[ ZK only
 	Welcome = true,
 	AreYouReady = true,

diff --git a/libs/liblobby/lobby/interface.lua b/libs/liblobby/lobby/interface.lua
@@ -1918,7 +1918,12 @@ function Interface:_OnRequestBattleStatus()
 end
 Interface.commands["REQUESTBATTLESTATUS"] = Interface._OnRequestBattleStatus
 
+-- 2024-06-06 FB: Ring is bypassed during command buffering. So we make sure, that ingameNotifications is on before playing the sound
 function Interface:_OnRing(userName)
+	local Configuration = WG.Chobby.Configuration
+	if self.bufferCommandsEnabled and not Configuration.ingameNotifcations then
+		return
+	end
 	self:_CallListeners("OnRing", userName)
 end
 Interface.commands["RING"] = Interface._OnRing