X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_phys.c;h=b26ebe225e90f6020e8411a7d6491565605a320b;hp=a918ea25603c7145aa59e09174643011a5e22152;hb=7ea07939bef0cbe85c54d9f68cb924198b0b1f64;hpb=4d34e0a632cbc401712f46e10bb9864438b0881f

diff --git a/sv_phys.c b/sv_phys.c
index a918ea25..b26ebe22 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -2350,7 +2350,11 @@ static void SV_WalkMove (prvm_edict_t *ent)
 		VectorCopy(PRVM_serveredictvector(ent, maxs), entmaxs);
 		trace = SV_TraceBox(upmove, entmins, entmaxs, downmove, type, ent, SV_GenericHitSuperContentsMask(ent), skipsupercontentsmask, skipmaterialflagsmask, collision_extendmovelength.value);
 		if(trace.fraction < 1 && trace.plane.normal[2] > 0.7)
+		{
 			clip |= 1; // but we HAVE found a floor
+			// set groundentity so we get carried when walking onto a mover with sv_gameplayfix_nogravityonground
+			PRVM_serveredictedict(ent, groundentity) = PRVM_EDICT_TO_PROG(trace.ent);
+		}
 	}
 
 	// if the move did not hit the ground at any point, we're not on ground