Merge pull request #215 from nerohiro/main

fix[pma-voice]: fixing some mislabeled variables
AvarianKnight · Nov 28, 2021 · 08584fd · 08584fd
2 parents b4e9185 + 2b25f17
commit 08584fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/init/main.lua b/client/init/main.lua
@@ -95,7 +95,7 @@ local disableSubmixReset = {}
 ---@param enabled boolean if the players voice is getting activated or deactivated
 ---@param moduleType string the volume & submix to use for the voice.
 function toggleVoice(plySource, enabled, moduleType)
-	if mutedPlayers[source] then return end
+	if mutedPlayers[plySource] then return end
 	logger.verbose('[main] Updating %s to talking: %s with submix %s', plySource, enabled, moduleType)
 	if enabled then
 		MumbleSetVolumeOverrideByServerId(plySource, enabled and volumes[moduleType])

diff --git a/server/module/radio.lua b/server/module/radio.lua
@@ -99,7 +99,7 @@ function setPlayerRadio(source, _radioChannel)
 		-- changed
 		TriggerClientEvent('pma-voice:clSetPlayerRadio', source, radioChannel)
 	end
-	Player(source).state.callChannel = callChannel
+	Player(source).state.radioChannel = radioChannel
 	if radioChannel ~= 0 and plyVoice.radio == 0 then
 		addPlayerToRadio(source, radioChannel)
 	elseif radioChannel == 0 then