From a89c7b6dc6c4ec4d77808a30228eb38fcfd74573 Mon Sep 17 00:00:00 2001
From: Mario <mario.mario@y7mail.com>
Date: Sat, 12 Nov 2022 13:26:25 +1000
Subject: [PATCH] Remove spawned monsters when the map is reset, fixes #2749

---
 qcsrc/common/monsters/sv_monsters.qc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index fc1681a91..1c8035380 100644
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -884,6 +884,12 @@ bool Monster_Appear_Check(entity this, Monster monster_id)
 
 void Monster_Reset(entity this)
 {
+	if(this.spawnflags & MONSTERFLAG_SPAWNED)
+	{
+		Monster_Remove(this);
+		return;
+	}
+
 	setorigin(this, this.pos1);
 	this.angles = this.pos2;
 
-- 
2.39.2