From 1daad6f48e7e2c2da62b6d06327fc95c43b0bf50 Mon Sep 17 00:00:00 2001
From: Carl Kittelberger <icedream@icedream.pw>
Date: Tue, 12 Apr 2016 20:36:04 +0200
Subject: [PATCH] Only initialize model list after unwanted entities have been
 removed.

---
 maps/mp/gametypes/hns.gsc   | 2 +-
 maps/mp/mods/_modellist.gsc | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/maps/mp/gametypes/hns.gsc b/maps/mp/gametypes/hns.gsc
index 0464e4c..71c737e 100644
--- a/maps/mp/gametypes/hns.gsc
+++ b/maps/mp/gametypes/hns.gsc
@@ -152,7 +152,6 @@ main()
 	maps\mp\gametypes\_tweakables::setTweakableValue("hardpoint", "allowhelicopter", "scr_hardpoint_allowhelicopter", 0);
 
 	level disableClassMenu();
-	level maps\mp\mods\_modellist::initModelList();
 
 	initGameFlags();
 	gameFlagInit("seekers_released", false);
@@ -292,6 +291,7 @@ onStartGameType()
 	allowed[1] = "war";
 	allowed[2] = level.gameType;
 	maps\mp\gametypes\_gameobjects::main(allowed);
+	level maps\mp\mods\_modellist::initModelList();
 
 	// scoring
 	maps\mp\gametypes\_rank::registerScoreInfo("win", 2);
diff --git a/maps/mp/mods/_modellist.gsc b/maps/mp/mods/_modellist.gsc
index 799c066..5f6ac55 100644
--- a/maps/mp/mods/_modellist.gsc
+++ b/maps/mp/mods/_modellist.gsc
@@ -10,6 +10,10 @@ createModel(modelname, RName)
 }
 
 initModelList() {
+	level.ModelList = [];
+	level.EntityList = [];
+	level.alreadyAddedModel = [];
+
 	initIgnoredModels();
 	initDisplayNames();
 	initFromEntArray("script_model", "classname");