X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=sv_phys.c;h=362689f8795fa954e69421a4e8c524e75bf331e5;hb=eb529936e63194bad80c9a4896a85a7a2e3610c6;hp=3a4a8b005e6e94bb66c847999b3eb47f99f5a26a;hpb=ad3882107f0d4c034ede6b13ba15a23086be4f6d;p=xonotic%2Fdarkplaces.git

diff --git a/sv_phys.c b/sv_phys.c
index 3a4a8b00..362689f8 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -343,7 +343,7 @@ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
 		model = sv.models[modelindex];
 		if (model != NULL)
 		{
-			if (!model->TraceBox)
+			if (!model->TraceBox && developer.integer >= 1)
 				Con_Printf("edict %i: SOLID_BSP with non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
 
 			if (ent->fields.server->angles[0] || ent->fields.server->angles[2] || ent->fields.server->avelocity[0] || ent->fields.server->avelocity[2])
@@ -523,6 +523,8 @@ int SV_CheckContentsTransition(prvm_edict_t *ent, const int nContents)
 				PRVM_G_FLOAT(OFS_PARM0) = ent->fields.server->watertype;
 				// New Contents
 				PRVM_G_FLOAT(OFS_PARM1) = nContents;
+				// Assign Self
+				prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
 			// Execute VM Function
 			PRVM_ExecuteProgram(contentstransition->function, "contentstransition: NULL function");
 		}
@@ -1988,7 +1990,7 @@ static void SV_Physics_Entity (prvm_edict_t *ent)
 	case MOVETYPE_FLYMISSILE:
 	case MOVETYPE_FLY:
 		// regular thinking
-		if (SV_RunThink (ent) && runmove)
+		if (SV_RunThink (ent) && (runmove || !sv_gameplayfix_delayprojectiles.integer))
 			SV_Physics_Toss (ent);
 		break;
 	default:
@@ -2113,6 +2115,7 @@ void SV_Physics_ClientEntity(prvm_edict_t *ent)
 				SV_AddGravity (ent);
 			SV_CheckStuck (ent);
 			SV_WalkMove (ent);
+			host_client->cmd.time = max(host_client->cmd.time, sv.time); // ignore client movement data for anything before NOW
 		}
 		break;
 	case MOVETYPE_TOSS: