Merge remote-tracking branch 'origin/master' into samual/mutator_ctf

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 9ed5acb9299ff9567805abaefa8fd1b55e8c4440..48b4fdd31cf695408019ae9dee2b7d1470510ee4 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -667,7 +667,7 @@ float Item_GiveTo(entity item, entity player)
                        pickedup = TRUE;
                        // sound not available
                        // AnnounceTo(player, "speed");
-                       player.invincible_finished = max(player.invincible_finished, time) + autocvar_g_balance_powerup_strength_time;
+                       player.invincible_finished = max(player.invincible_finished, time) + autocvar_g_balance_powerup_invincible_time;
                }
        }
        else