# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1629433038 14400
#      Fri Aug 20 00:17:18 2021 -0400
# Node ID f92c10f0e02c7e75d48bf447c2015f1842d388b8
# Parent  f7b45cc24217a53d67536f7924fbeb4d9cf16eec
Fixed ACS scripts puked by the server RCON from using player 0 as the activator.

diff -r f7b45cc24217 -r f92c10f0e02c docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Wed Aug 18 19:28:44 2021 -0400
+++ b/docs/zandronum-history.txt	Fri Aug 20 00:17:18 2021 -0400
@@ -91,6 +91,7 @@
 -	- Fixed dormant sounds from still playing upon resetting the map. [Kaminsky]
 -	- Fixed a player's old body from being frozen and not finishing their animation when they become a dead spectator. [Kaminsky]
 -	- Fixed dead spectators not spawning where they died if sv_samespawnspot is enabled. [Kaminsky]
+-	- Fixed ACS scripts puked by the server RCON from using player 0 as the activator. [Kaminsky]
 !	- sv_forcegldefaults renamed to sv_forcevideodefaults. The old name still exists for compatibility. [Dusk]
 !	- r_3dfloors is now forced to be true when sv_forcevideodefaults is true. [Dusk]
 !	- When the wad authentication fails for a connecting client, the client only reports the missing and incompatible PWADS instead of all of them. [Pol Marcet]
diff -r f7b45cc24217 -r f92c10f0e02c src/c_cmds.cpp
--- a/src/c_cmds.cpp	Wed Aug 18 19:28:44 2021 -0400
+++ b/src/c_cmds.cpp	Fri Aug 20 00:17:18 2021 -0400
@@ -761,7 +761,7 @@
 	// is done in P_StartScript, no need to check here.
 	if ( ( NETWORK_GetState( ) == NETSTATE_SERVER ) || ACS_IsScriptClientSide ( script ) )
 	{
-		P_StartScript( players[consoleplayer].mo, NULL, script, level.mapname,
+		P_StartScript( NETWORK_GetState( ) == NETSTATE_SERVER ? NULL : players[consoleplayer].mo, NULL, script, level.mapname,
 			args, 4, ( (script < 0 ) ? ACS_ALWAYS : 0 ) | ACS_NET );
 
 		// [BB] If the server (and not any ACS script via ConsoleCommand) calls puke, let the clients know.