also move this block

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 0e81d82fe01db65459b8f1c90b38afcc6cdd3f0f..9241813f0a239f748bacb26efe582bd73612ef0a 100644 (file)
--- 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)
                {