From: Mario <mario@smbclan.net>
Date: Fri, 17 Jun 2016 12:52:03 +0000 (+1000)
Subject: Don't run MOVETYPE_NOCLIP physics asynchronously
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=488084220c1443763ce1efd291a17b72e91bf2a1;p=xonotic%2Fdarkplaces.git

Don't run MOVETYPE_NOCLIP physics asynchronously
---

diff --git a/sv_phys.c b/sv_phys.c
index 87717114..92f75c28 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -3074,9 +3074,12 @@ static void SV_Physics_ClientEntity(prvm_edict_t *ent)
 		break;
 	case MOVETYPE_NOCLIP:
 		SV_RunThink(ent);
-		SV_CheckWater(ent);
-		VectorMA(PRVM_serveredictvector(ent, origin), sv.frametime, PRVM_serveredictvector(ent, velocity), PRVM_serveredictvector(ent, origin));
-		VectorMA(PRVM_serveredictvector(ent, angles), sv.frametime, PRVM_serveredictvector(ent, avelocity), PRVM_serveredictvector(ent, angles));
+		if (host_client->clmovement_inputtimeout <= 0) // don't run physics here if running asynchronously
+		{
+			SV_CheckWater(ent);
+			VectorMA(PRVM_serveredictvector(ent, origin), sv.frametime, PRVM_serveredictvector(ent, velocity), PRVM_serveredictvector(ent, origin));
+			VectorMA(PRVM_serveredictvector(ent, angles), sv.frametime, PRVM_serveredictvector(ent, avelocity), PRVM_serveredictvector(ent, angles));
+		}
 		break;
 	case MOVETYPE_STEP:
 		if (host_client->clmovement_inputtimeout <= 0) // don't run physics here if running asynchronously