X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fitems%2Fitems.qc;fp=qcsrc%2Fserver%2Fitems%2Fitems.qc;h=829418497dff6483dd53816dd2451714b6624f60;hb=b11ef2d3306ddecba0f55576922dd27801e10e03;hp=e0013b5ce0d37ff4eff0cd2a5bedd0c52407e189;hpb=105af41cc4fd08115b80ba1c5f8f5f2e8139f886;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index e0013b5ce..829418497 100644
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -679,6 +679,7 @@ void Item_Touch(entity this, entity toucher)
 	{
 		if (ITEM_TOUCH_NEEDKILL())
 		{
+			this.SendFlags |= ISF_REMOVEFX;
 			RemoveItem(this);
 			return;
 		}
@@ -742,7 +743,8 @@ LABEL(pickup)
 
 	if (ITEM_IS_LOOT(this))
 	{
-		delete(this);
+		this.SendFlags |= ISF_REMOVEFX;
+		RemoveItem(this);
 		return;
 	}
 	if (!this.spawnshieldtime)
@@ -847,7 +849,16 @@ void RemoveItem(entity this)
 	if(wasfreed(this) || !this) { return; }
 	if(this.waypointsprite_attached)
 		WaypointSprite_Kill(this.waypointsprite_attached);
-	delete(this);
+
+	if (this.SendFlags & ISF_REMOVEFX)
+	{
+		// delay removal until ISF_REMOVEFX has been sent
+		setthink(this, RemoveItem);
+		this.nextthink = time + 2 * autocvar_sys_ticrate; // micro optimisation: next frame will be too soon
+		this.solid = SOLID_NOT; // untouchable
+	}
+	else
+		delete(this);
 }
 
 // pickup evaluation functions