Bugfix Ref. #9

*Fixed a native Call Bug with SB Material Admin
DJPlaya · Jun 5, 2020 · 06bd0f0 · 06bd0f0
1 parent 0995cba
commit 06bd0f0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/plugins/forlix_floodcheck_redux.smx b/plugins/forlix_floodcheck_redux.smx
diff --git a/scripting/1.10/FFCR/voiceloopback.sp b/scripting/1.10/FFCR/voiceloopback.sp
@@ -98,7 +98,7 @@ void FFCR_UnMute(int iClient, bool bAction)
 		GetClientAuthId(iClient, AuthId_Steam3, cSteamID, 16);
 		GetClientIP(iClient, cIP, MAX_IPPORT_LEN); // No Port
 		GetClientName(iClient, cName, 32);
-		if (!MAOffSetClientMuteType(iClient, cSteamID, cIP, cName, MSG_LOOPBACK_MUTE, bAction ? MA_MUTE : MA_UNMUTE, 0))
+		if (!MAOffSetClientMuteType(0, cSteamID, cIP, cName, MSG_LOOPBACK_MUTE, bAction ? MA_MUTE : MA_UNMUTE, 0))
 		{
 			LogError("[Error] Failed to perform an SB Material Admin %s on '%L', he has been %s regularly instead", bAction ? "mute" : "unmute", iClient, bAction ? "muted" : "unmuted")
 			MALog(MA_LogAction, "[Error] Failed to perform an SB Material Admin %s on '%L', he has been %s regularly instead", bAction ? "mute" : "unmute", iClient, bAction ? "muted" : "unmuted");

diff --git a/scripting/1.10/forlix_floodcheck_redux.sp b/scripting/1.10/forlix_floodcheck_redux.sp
@@ -206,9 +206,9 @@ public Action FFCR_TEST(int iClient, char cArgs)
 	for (int iTarget = 1; iTarget < MaxClients; iTarget++)
 	{
 		ReplyToCommand(iClient, "[Debug][FFCR] Client '%L' is %s", iTarget, FFCR_IsClientMuted(iTarget) ? "Muted" : "Unmuted");
-		ReplyToCommand(iClient, "[Debug][FFCR] Setting Client to muted...");
-		FFCR_UnMute(iTarget, true);
-		ReplyToCommand(iClient, "[Debug][FFCR] Client '%L' is %s", iTarget, FFCR_IsClientMuted(iTarget) ? "Muted" : "Unmuted");
+		ReplyToCommand(iClient, "[Debug][FFCR] Setting Client to %s", FFCR_IsClientMuted(iTarget) ? "Unmuted" : "Muted");
+		FFCR_UnMute(iTarget, !FFCR_IsClientMuted(iTarget));
+		ReplyToCommand(iClient, "[Debug][FFCR] Client '%L' now is %s", iTarget, FFCR_IsClientMuted(iTarget) ? "Muted" : "Unmuted");
 	}
 }
 

diff --git a/scripting/1.8/FFCR/voiceloopback.sp b/scripting/1.8/FFCR/voiceloopback.sp
@@ -98,7 +98,7 @@ void FFCR_UnMute(int iClient, bool bAction)
 		GetClientAuthId(iClient, AuthId_Steam3, cSteamID, 16);
 		GetClientIP(iClient, cIP, MAX_IPPORT_LEN); // No Port
 		GetClientName(iClient, cName, 32);
-		if (!MAOffSetClientMuteType(iClient, cSteamID, cIP, cName, MSG_LOOPBACK_MUTE, bAction ? MA_MUTE : MA_UNMUTE, 0))
+		if (!MAOffSetClientMuteType(0, cSteamID, cIP, cName, MSG_LOOPBACK_MUTE, bAction ? MA_MUTE : MA_UNMUTE, 0))
 		{
 			LogError("[Error] Failed to perform an SB Material Admin %s on '%L', he has been %s regularly instead", bAction ? "mute" : "unmute", iClient, bAction ? "muted" : "unmuted")
 			MALog(MA_LogAction, "[Error] Failed to perform an SB Material Admin %s on '%L', he has been %s regularly instead", bAction ? "mute" : "unmute", iClient, bAction ? "muted" : "unmuted");

diff --git a/scripting/1.8/forlix_floodcheck_redux.sp b/scripting/1.8/forlix_floodcheck_redux.sp
@@ -3,6 +3,12 @@
 //
 // Copyright (c) 2008-2013 Dominik Friedrichs
 
+
+//- Compiler Options -//
+
+#pragma newdecls optional
+
+
 //- Includes -//
 
 #include <sdktools>
@@ -200,9 +206,9 @@ public Action FFCR_TEST(int iClient, char cArgs)
 	for (int iTarget = 1; iTarget < MaxClients; iTarget++)
 	{
 		ReplyToCommand(iClient, "[Debug][FFCR] Client '%L' is %s", iTarget, FFCR_IsClientMuted(iTarget) ? "Muted" : "Unmuted");
-		ReplyToCommand(iClient, "[Debug][FFCR] Setting Client to muted...");
-		FFCR_UnMute(iTarget, true);
-		ReplyToCommand(iClient, "[Debug][FFCR] Client '%L' is %s", iTarget, FFCR_IsClientMuted(iTarget) ? "Muted" : "Unmuted");
+		ReplyToCommand(iClient, "[Debug][FFCR] Setting Client to %s", FFCR_IsClientMuted(iTarget) ? "Unmuted" : "Muted");
+		FFCR_UnMute(iTarget, !FFCR_IsClientMuted(iTarget));
+		ReplyToCommand(iClient, "[Debug][FFCR] Client '%L' now is %s", iTarget, FFCR_IsClientMuted(iTarget) ? "Muted" : "Unmuted");
 	}
 }