X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sv_move.c;h=67789929a16619e62d506541cb49c0abc5eccaa3;hb=6f3bab1b7cfe0575844bcab86d1267f4c767937b;hp=2c1eb00ed48c065144edc1afea3836e5c2d280dd;hpb=16742571f9a7d696a654668febdc10b4f4affd57;p=xonotic%2Fdarkplaces.git

diff --git a/sv_move.c b/sv_move.c
index 2c1eb00e..67789929 100644
--- a/sv_move.c
+++ b/sv_move.c
@@ -124,7 +124,9 @@ qboolean SV_movestep (prvm_edict_t *ent, vec3_t move, qboolean relink, qboolean
 		for (i=0 ; i<2 ; i++)
 		{
 			VectorAdd (ent->fields.server->origin, move, neworg);
-			if (!noenemy)
+			if (noenemy)
+				enemy = prog->edicts;
+			else
 			{
 				enemy = PRVM_PROG_TO_EDICT(ent->fields.server->enemy);
 				if (i == 0 && enemy != prog->edicts)