From 9893e8bc3ea4385d8e7fe34e8824ac77ae51e6c4 Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Wed, 6 Mar 2024 22:24:44 -0800
Subject: [PATCH] CSMultiplayerRules: Remove temp items after respawning
 everything else to avoid phantom pickups.

---
 src/server/gamerules_multiplayer.qc | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc
index 0c11a65..7215382 100644
--- a/src/server/gamerules_multiplayer.qc
+++ b/src/server/gamerules_multiplayer.qc
@@ -589,15 +589,6 @@ CSMultiplayerRules::RestartRound(int iWipe)
 		}
 	}
 
-	/* clear the corpses/items/bombs */
-	for (entity eFind = world; (eFind = find(eFind, ::classname, "remove_me"));) {
-		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;
 		dec.m_strTexture = "";
@@ -657,6 +648,16 @@ CSMultiplayerRules::RestartRound(int iWipe)
 			caw.Respawn();
 	}
 
+	/* clear the corpses/items/bombs */
+	for (entity eFind = world; (eFind = find(eFind, ::classname, "remove_me"));) {
+		if (eFind.identity) {
+			NSEntity toRemove = (NSEntity)eFind;
+			toRemove.Destroy();
+		} else {
+			remove(eFind);
+		}
+	}
+
 	CSBot_BuyStart();
 	TimerBegin(autocvar_mp_freezetime, GAME_FREEZE);
 	Money_ResetTeamReward();