From 3b0d7b7fdc88a9b6e6e3828e50658f9740fbfd77 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Sun, 26 Apr 2020 13:23:18 +0200
Subject: [PATCH] Weapons: Make sure dropped items get purged between rounds.

---
 src/server/valve/items.cpp       | 2 +-
 src/shared/valve/weapon_common.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/valve/items.cpp b/src/server/valve/items.cpp
index da41cfb7..3a2ffe42 100644
--- a/src/server/valve/items.cpp
+++ b/src/server/valve/items.cpp
@@ -43,7 +43,7 @@ void item_pickup::touch(void)
 
 	CBaseTrigger::UseTargets();
 
-	if (cvar("sv_playerslots") == 1) {
+	if (m_iWasDropped == 1 || cvar("sv_playerslots") == 1) {
 		remove(self);
 	} else {
 		Hide();
diff --git a/src/shared/valve/weapon_common.c b/src/shared/valve/weapon_common.c
index b95c8136..485a8f6a 100644
--- a/src/shared/valve/weapon_common.c
+++ b/src/shared/valve/weapon_common.c
@@ -414,6 +414,7 @@ void CSEv_DropWeapon(void)
 	drop.think = DropWeapon_Enable;
 	drop.nextthink = time + 1.5f;
 	drop.movetype = MOVETYPE_TOSS;
+	drop.classname = "remove_me";
 
 	makevectors(pl.v_angle);
 	drop.velocity = v_forward * 256;