X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fspawnpoints.qc;h=03b40c5e12864aa7570c19ff0169c0ec107162b2;hb=a7d85a2841c15a886ca8bcf55276668d58274f34;hp=dcf6016c5e326b902e8c59f06519ab86215ee707;hpb=50d6cb6a02a959a7303b5b687631b664a807b26f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index dcf6016c5..03b40c5e1 100644
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -248,7 +248,7 @@ vector Spawn_Score(entity this, entity spot, float mindist, float teamcheck)
 	vector spawn_score = prio * '1 0 0' + shortest * '0 1 0';
 
 	// filter out spots for assault
-	if(spot.target != "")
+	if(spot.target && spot.target != "")
 	{
 		int found = 0;
 		for(entity targ = findchain(targetname, spot.target); targ; targ = targ.chain)
@@ -327,14 +327,21 @@ SelectSpawnPoint
 Finds a point to respawn
 =============
 */
+bool testspawn_checked;
+entity testspawn_point;
 entity SelectSpawnPoint(entity this, bool anypoint)
 {
 	float teamcheck;
-	entity spot, firstspot;
+	entity spot = NULL;
 
-	spot = find(NULL, classname, "testplayerstart");
-	if (spot)
-		return spot;
+	if(!testspawn_checked)
+	{
+		testspawn_point = find(NULL, classname, "testplayerstart");
+		testspawn_checked = true;
+	}
+
+	if(testspawn_point)
+		return testspawn_point;
 
 	if(this.spawnpoint_targ)
 		return this.spawnpoint_targ;
@@ -365,7 +372,16 @@ entity SelectSpawnPoint(entity this, bool anypoint)
 
 
 	// get the entire list of spots
-	firstspot = findchain(classname, "info_player_deathmatch");
+	//entity firstspot = findchain(classname, "info_player_deathmatch");
+	entity firstspot = IL_FIRST(g_spawnpoints);
+	entity prev = NULL;
+	IL_EACH(g_spawnpoints, true,
+	{
+		if(prev)
+			prev.chain = it;
+		it.chain = NULL;
+		prev = it;
+	});
 	// filter out the bad ones
 	// (note this returns the original list if none survived)
 	if(anypoint)