From ff59be9392350de5dbaca6bf5f91ffb974e9f04c Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Wed, 1 Mar 2023 21:58:55 -0800
Subject: [PATCH] CSMultiplayerRules: use Destroy() instead of plain remove()
 on NSEntity derivatives

---
 src/server/gamerules_multiplayer.qc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc
index c821a7b..07c5c56 100644
--- a/src/server/gamerules_multiplayer.qc
+++ b/src/server/gamerules_multiplayer.qc
@@ -485,7 +485,12 @@ CSMultiplayerRules::RestartRound(int iWipe)
 
 	/* clear the corpses/items/bombs */
 	for (entity eFind = world; (eFind = find(eFind, ::classname, "remove_me"));) {
-		remove(eFind);
+		if (eFind.identity) {
+			NSEntity e = (NSEntity)eFind;
+			e.Destroy();
+		} else {
+			remove(eFind);
+		}
 	}
 	for (entity eFind = world; (eFind = find(eFind, ::classname, "tempdecal"));) {
 		decal dec = (decal)eFind;