From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 16 Dec 2011 17:13:15 +0000 (+0100)
Subject: also move this block
X-Git-Tag: xonotic-v0.6.0~74^2~96
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=102a364ffc6c386fcdeb062f7b3e2a66619fb025;p=xonotic%2Fxonotic-data.pk3dir.git

also move this block
---

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 0e81d82fe..9241813f0 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -305,13 +305,6 @@ float Item_GiveTo(entity item, entity player)
 				player.pauserotfuel_finished = max(player.pauserotfuel_finished, time + autocvar_g_balance_pause_fuel_rot);
 			}
 
-			if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK))
-			{
-				pickedup = TRUE;
-				player.items |= it;
-				sprint (player, strcat("You got the ^2", item.netname, "\n"));
-			}
-
 			_switchweapon = TRUE;
 			if (item.ammo_cells)
 			{
@@ -336,6 +329,13 @@ float Item_GiveTo(entity item, entity player)
 			}
 		}
 
+		if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK))
+		{
+			pickedup = TRUE;
+			player.items |= it;
+			sprint (player, strcat("You got the ^2", item.netname, "\n"));
+		}
+
 		// extralife powerup
 		if (item.max_health)
 		{