From 0aad92d7c199a68bb4a49f49adec649ab9b9e277 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 6 Apr 2009 07:42:11 +0000
Subject: [PATCH] fix 2735547

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6441 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/t_items.qc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index f3f814442..70278bf93 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -233,7 +233,8 @@ float Item_GiveTo(entity item, entity player)
 
 	sound (player, CHAN_AUTO, item.item_pickupsound, VOL_BASE, ATTN_NORM);
 	if (_switchweapon)
-		W_SwitchWeapon_Force(player, w_getbestweapon(player));
+		if (player.switchweapon != w_getbestweapon(player))
+			W_SwitchWeapon_Force(player, w_getbestweapon(player));
 
 	return 1;
 }
-- 
2.39.2