From d4de130fe002d1b3f03a62729b9a6858af3ac504 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Tue, 11 Apr 2023 13:20:25 +0100
Subject: [PATCH] More sanity checks for skipping restricted queue entries

- GTR_FORBIDMP in netgames
- mapheader doesn't exist
---
 src/g_game.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/g_game.c b/src/g_game.c
index cb5f728a5..29edf7bd6 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4125,6 +4125,8 @@ static void G_GetNextMap(void)
 
 		while (roundqueue.position < roundqueue.size
 			&& (roundqueue.entries[roundqueue.position].mapnum >= nummapheaders
+			|| mapheaderinfo[roundqueue.entries[roundqueue.position].mapnum] == NULL
+			|| (netgame && (gametypes[roundqueue.entries[roundqueue.position].gametype]->rules & GTR_FORBIDMP))
 			|| (permitrank == false && roundqueue.entries[roundqueue.position].rankrestricted == true)))
 		{
 			// Skip all restricted queue entries.