Fix the funcommands plugin resetting all players' color and transparency on round end (#2446)

RealBerke · psychonic · web-flow · commit 5d28ea6162db · 2026-04-26T16:34:37.000Z
* Add check for client status before resetting

* Get rid of unnecessary color reset on beacon remove

* Fix firebomb/timebomb resetting color when effect was not active

* Fix firebomb toggling wrong client's active status

---------

Co-authored-by: Nicholas Hastings &lt;nshastings@gmail.com&gt;
diff --git a/plugins/funcommands/beacon.sp b/plugins/funcommands/beacon.sp
@@ -44,18 +44,16 @@ void CreateBeacon(int client)
 void KillBeacon(int client)
 {
 	g_BeaconSerial[client] = 0;
-
-	if (IsClientInGame(client))
-	{
-		SetEntityRenderColor(client, 255, 255, 255, 255);
-	}
 }
 
 void KillAllBeacons()
 {
 	for (int i = 1; i <= MaxClients; i++)
 	{
-		KillBeacon(i);
+		if (g_BeaconSerial[i] != 0)
+		{
+			KillBeacon(i);
+		}
 	}
 }
 
diff --git a/plugins/funcommands/fire.sp b/plugins/funcommands/fire.sp
@@ -48,6 +48,11 @@ void CreateFireBomb(int client)
 
 void KillFireBomb(int client)
 {
+	if (g_FireBombSerial[client] == 0)
+	{
+		return;
+	}
+
 	g_FireBombSerial[client] = 0;
 
 	if (IsClientInGame(client))
@@ -72,15 +77,14 @@ void PerformBurn(int client, int target, float seconds)
 
 void PerformFireBomb(int client, int target)
 {
-	if (g_FireBombSerial[client] == 0)
+	if (g_FireBombSerial[target] == 0)
 	{
 		CreateFireBomb(target);
 		LogAction(client, target, "\"%L\" set a FireBomb on \"%L\"", client, target);
 	}
 	else
 	{
 		KillFireBomb(target);
-		SetEntityRenderColor(client, 255, 255, 255, 255);
 		LogAction(client, target, "\"%L\" removed a FireBomb on \"%L\"", client, target);
 	}
 }
@@ -173,7 +177,6 @@ public Action Timer_FireBomb(Handle timer, any value)
 
 		IgniteEntity(client, g_Cvar_BurnDuration.FloatValue);
 		KillFireBomb(client);
-		SetEntityRenderColor(client, 255, 255, 255, 255);
 		
 		if (g_Cvar_FireBombMode.IntValue > 0)
 		{
diff --git a/plugins/funcommands/timebomb.sp b/plugins/funcommands/timebomb.sp
@@ -47,6 +47,11 @@ void CreateTimeBomb(int client)
 
 void KillTimeBomb(int client)
 {
+	if (g_TimeBombSerial[client] == 0)
+	{
+		return;
+	}
+
 	g_TimeBombSerial[client] = 0;
 
 	if (IsClientInGame(client))
@@ -73,7 +78,6 @@ void PerformTimeBomb(int client, int target)
 	else
 	{
 		KillTimeBomb(target);
-		SetEntityRenderColor(client, 255, 255, 255, 255);
 		LogAction(client, target, "\"%L\" removed a TimeBomb on \"%L\"", client, target);
 	}
 }
@@ -149,7 +153,6 @@ public Action Timer_TimeBomb(Handle timer, any value)
 
 		ForcePlayerSuicide(client);
 		KillTimeBomb(client);
-		SetEntityRenderColor(client, 255, 255, 255, 255);
 		
 		if (g_Cvar_TimeBombMode.IntValue > 0)
 		{

Original file line number	Diff line number	Diff line change
`@@ -44,18 +44,16 @@ void CreateBeacon(int client)`
`44`	`44`	`void KillBeacon(int client)`
`45`	`45`	`{`
`46`	`46`	`g_BeaconSerial[client] = 0;`
`47`		`-`
`48`		`- if (IsClientInGame(client))`
`49`		`- {`
`50`		`- SetEntityRenderColor(client, 255, 255, 255, 255);`
`51`		`- }`
`52`	`47`	`}`
`53`	`48`
`54`	`49`	`void KillAllBeacons()`
`55`	`50`	`{`
`56`	`51`	`for (int i = 1; i <= MaxClients; i++)`
`57`	`52`	`{`
`58`		`- KillBeacon(i);`
	`53`	`+ if (g_BeaconSerial[i] != 0)`
	`54`	`+ {`
	`55`	`+ KillBeacon(i);`
	`56`	`+ }`
`59`	`57`	`}`
`60`	`58`	`}`
`61`	`59`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,11 @@ void CreateFireBomb(int client)`
`48`	`48`
`49`	`49`	`void KillFireBomb(int client)`
`50`	`50`	`{`
	`51`	`+ if (g_FireBombSerial[client] == 0)`
	`52`	`+ {`
	`53`	`+ return;`
	`54`	`+ }`
	`55`	`+`
`51`	`56`	`g_FireBombSerial[client] = 0;`
`52`	`57`
`53`	`58`	`if (IsClientInGame(client))`
`@@ -72,15 +77,14 @@ void PerformBurn(int client, int target, float seconds)`
`72`	`77`
`73`	`78`	`void PerformFireBomb(int client, int target)`
`74`	`79`	`{`
`75`		`- if (g_FireBombSerial[client] == 0)`
	`80`	`+ if (g_FireBombSerial[target] == 0)`
`76`	`81`	`{`
`77`	`82`	`CreateFireBomb(target);`
`78`	`83`	`LogAction(client, target, "\"%L\" set a FireBomb on \"%L\"", client, target);`
`79`	`84`	`}`
`80`	`85`	`else`
`81`	`86`	`{`
`82`	`87`	`KillFireBomb(target);`
`83`		`- SetEntityRenderColor(client, 255, 255, 255, 255);`
`84`	`88`	`LogAction(client, target, "\"%L\" removed a FireBomb on \"%L\"", client, target);`
`85`	`89`	`}`
`86`	`90`	`}`
`@@ -173,7 +177,6 @@ public Action Timer_FireBomb(Handle timer, any value)`
`173`	`177`
`174`	`178`	`IgniteEntity(client, g_Cvar_BurnDuration.FloatValue);`
`175`	`179`	`KillFireBomb(client);`
`176`		`- SetEntityRenderColor(client, 255, 255, 255, 255);`
`177`	`180`
`178`	`181`	`if (g_Cvar_FireBombMode.IntValue > 0)`
`179`	`182`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,11 @@ void CreateTimeBomb(int client)`
`47`	`47`
`48`	`48`	`void KillTimeBomb(int client)`
`49`	`49`	`{`
	`50`	`+ if (g_TimeBombSerial[client] == 0)`
	`51`	`+ {`
	`52`	`+ return;`
	`53`	`+ }`
	`54`	`+`
`50`	`55`	`g_TimeBombSerial[client] = 0;`
`51`	`56`
`52`	`57`	`if (IsClientInGame(client))`
`@@ -73,7 +78,6 @@ void PerformTimeBomb(int client, int target)`
`73`	`78`	`else`
`74`	`79`	`{`
`75`	`80`	`KillTimeBomb(target);`
`76`		`- SetEntityRenderColor(client, 255, 255, 255, 255);`
`77`	`81`	`LogAction(client, target, "\"%L\" removed a TimeBomb on \"%L\"", client, target);`
`78`	`82`	`}`
`79`	`83`	`}`
`@@ -149,7 +153,6 @@ public Action Timer_TimeBomb(Handle timer, any value)`
`149`	`153`
`150`	`154`	`ForcePlayerSuicide(client);`
`151`	`155`	`KillTimeBomb(client);`
`152`		`- SetEntityRenderColor(client, 255, 255, 255, 255);`
`153`	`156`
`154`	`157`	`if (g_Cvar_TimeBombMode.IntValue > 0)`
`155`	`158`	`{`