Commit: ad6af2938ba9d68007666cdbc2972834b007fec6 - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

Commit MetaInfo

• Revision: ad6af2938ba9d68007666cdbc2972834b007fec6 (tree)
• Time: 2022-06-08 04:23:50
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed: unlagged would also reconcile for bots, causing them to miss shots in online games. Also added a sanity check to make sure that the actor isn't NULL.

Change Summary

• modified: src/unlagged.cpp

Incremental Difference

diff -r d35edbc7fed1 -r ad6af2938ba9 src/unlagged.cpp
--- a/src/unlagged.cpp	Mon Jun 06 21:52:09 2022 -0400
+++ b/src/unlagged.cpp	Tue Jun 07 15:23:50 2022 -0400
@@ -131,10 +131,12 @@
 // Call UNLAGGED_Restore afterwards to restore everything
 void UNLAGGED_Reconcile( AActor *actor )
 {
-	//Only do anything if the actor to be reconciled is a player,
-	//it's on a server with unlagged on, and reconciliation is not being blocked
-	if ( !actor->player || (NETWORK_GetState() != NETSTATE_SERVER) || ( zadmflags & ZADF_NOUNLAGGED ) ||
-		 ( ( actor->player->userinfo.GetClientFlags() & CLIENTFLAGS_UNLAGGED ) == 0 ) || ( reconciliationBlockers > 0 ) )
+	// [AK] Don't do anything if it's not a server with unlagged or if reconciliation is being blocked.
+	if (( NETWORK_GetState( ) != NETSTATE_SERVER ) || ( zadmflags & ZADF_NOUNLAGGED ) || ( reconciliationBlockers > 0 ))
+		return;
+
+	// [AK] Don't do anything if the actor isn't a player, is a bot, or if this player disabled unlagged for themselves.
+	if (( actor == NULL ) || ( actor->player == NULL ) || ( actor->player->bIsBot ) || (( actor->player->userinfo.GetClientFlags( ) & CLIENTFLAGS_UNLAGGED ) == 0 ))
 		return;
 
 	//Something went wrong, reconciliation was attempted when the gamestate