From: Mario <mario@smbclan.net>
Date: Sat, 24 Aug 2019 07:49:58 +0000 (+1000)
Subject: If the monster already has flags set to FL_MONSTER, don't push it to the monster... 
X-Git-Tag: xonotic-v0.8.5~1374
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89734cb472048e138cf35c81b1523b9cf427f5b3;p=xonotic%2Fxonotic-data.pk3dir.git

If the monster already has flags set to FL_MONSTER, don't push it to the monster list, as it should already exist there (fixes warnings when setting monsters to appear)
---

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index c707f8c38..0673cd0ba 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1318,7 +1318,7 @@ bool Monster_Spawn(entity this, bool check_appear, int mon_id)
 
 	if(!autocvar_g_monsters) { Monster_Remove(this); return false; }
 
-	if(!(this.spawnflags & MONSTERFLAG_RESPAWNED))
+	if(!(this.spawnflags & MONSTERFLAG_RESPAWNED) && !(this.flags & FL_MONSTER))
 	{
 		IL_PUSH(g_monsters, this);
 		if(this.mdl && this.mdl != "")