X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_phys.c;h=8d2dfb07010db8a76d41a17ef2ef8d051ac7057d;hb=22442382b975b7dc9fa1541eb5c259664d10d100;hp=59c02e1e804403b2ecb503c717f6f8a41ead2791;hpb=e5026b6eb290b2098c6ce92ae7b777fb4457227b;p=xonotic%2Fdarkplaces.git

diff --git a/sv_phys.c b/sv_phys.c
index 59c02e1e..8d2dfb07 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1357,7 +1357,7 @@ void SV_Physics_Step (edict_t *ent)
 		SV_LinkEdict(ent, true);
 
 		// just hit ground
-		if (hitsound && (int)ent->v->flags & FL_ONGROUND)
+		if (hitsound && (int)ent->v->flags & FL_ONGROUND && gamemode != GAME_NEXUIZ)
 			SV_StartSound(ent, 0, "demon/dland2.wav", 255, 1);
 	}
 
@@ -1405,8 +1405,11 @@ void SV_Physics (void)
 		if (pr_global_struct->force_retouch)
 			SV_LinkEdict (ent, true);	// force retouch even for stationary
 
-		if (i >= 1 && i <= svs.maxclients && svs.clients[i-1].spawned)
+		if (i >= 1 && i <= svs.maxclients)
 		{
+			// don't do physics on disconnected clients, FrikBot relies on this
+			if (!svs.clients[i-1].spawned)
+				continue;
 			// connected slot
 			// call standard client pre-think
 			SV_CheckVelocity (ent);
@@ -1484,7 +1487,7 @@ void SV_Physics (void)
 			break;
 		}
 
-		if (i >= 1 && i <= svs.maxclients && svs.clients[i-1].spawned)
+		if (i >= 1 && i <= svs.maxclients)
 		{
 			SV_CheckVelocity (ent);