From: bones_was_here <bones_was_here@xa.org.au>
Date: Wed, 26 Aug 2020 02:23:25 +0000 (+1000)
Subject: Fix netname field of weapon and item entities (was getting set to m_name)
X-Git-Tag: xonotic-v0.8.5~352^2~43
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69775c048f13c32062f542016604231f6dafade9;p=xonotic%2Fxonotic-data.pk3dir.git

Fix netname field of weapon and item entities (was getting set to m_name)
---

diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index 861b21eed..bec701e13 100644
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -1055,7 +1055,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default
 	this.bot_pickupevalfunc = pickupevalfunc;
 	this.bot_pickupbasevalue = pickupbasevalue;
 	this.mdl = this.model ? this.model : strzone(this.item_model_ent.model_str());
-	this.netname = itemname;
+	this.netname = (def.m_weapon) ? def.m_weapon.netname : def.netname;
 	settouch(this, Item_Touch);
 	setmodel(this, MDL_Null); // precision set below
 	//this.effects |= EF_LOWPRECISION;