Sometimes teleports wouldn't work because physics impacts were proces…

…sed before the player's thinkings, fixed it by moving the processed impacts before thinking functions.
ValveSoftware · Dec 20, 2017 · d370302 · d370302
1 parent ff47d39
commit d370302
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/mp/src/game/server/player_command.cpp b/mp/src/game/server/player_command.cpp
@@ -417,6 +417,11 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 	{
 		player->pl.v_angle = ucmd->viewangles + player->pl.anglechange;
 	}
+
+    // Let server invoke any needed impact functions
+    VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
+    moveHelper->ProcessImpacts();
+    VPROF_SCOPE_END();
 
 	// Call standard client pre-think
 	RunPreThink( player );
@@ -451,11 +456,6 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 		player->pl.v_angle = player->GetLockViewanglesData();
 	}
 
-	// Let server invoke any needed impact functions
-	VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
-	moveHelper->ProcessImpacts();
-	VPROF_SCOPE_END();
-
 	g_pGameMovement->FinishTrackPredictionErrors( player );
 
 	FinishCommand( player );

diff --git a/sp/src/game/server/player_command.cpp b/sp/src/game/server/player_command.cpp
@@ -416,6 +416,11 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 	{
 		player->pl.v_angle = ucmd->viewangles + player->pl.anglechange;
 	}
+
+	// Let server invoke any needed impact functions
+	VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
+	moveHelper->ProcessImpacts();
+	VPROF_SCOPE_END();
 
 	// Call standard client pre-think
 	RunPreThink( player );
@@ -444,11 +449,6 @@ void CPlayerMove::RunCommand ( CBasePlayer *player, CUserCmd *ucmd, IMoveHelper
 	// Copy output
 	FinishMove( player, ucmd, g_pMoveData );
 
-	// Let server invoke any needed impact functions
-	VPROF_SCOPE_BEGIN( "moveHelper->ProcessImpacts" );
-	moveHelper->ProcessImpacts();
-	VPROF_SCOPE_END();
-
 	g_pGameMovement->FinishTrackPredictionErrors( player );
 
 	FinishCommand( player );