X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=3471ce1b046fd54dc00a8b12dad110e22115360c;hp=b7c3c56eb93fc9a9aef32d82adc04b00c02a2114;hb=2bb2db9c0f8016645a23381d7493588d748ecacf;hpb=588148c163f6837f4608b4c1353f3bc7a88f57b5

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index b7c3c56eb9..3471ce1b04 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -277,8 +277,6 @@ float have_pickup_item(void)
 			return TRUE;
 		if(autocvar_g_powerups == 0)
 			return FALSE;
-		if(g_lms)
-			return FALSE;
 		if(g_ca)
 			return FALSE;
 		if(g_arena)
@@ -290,8 +288,6 @@ float have_pickup_item(void)
 			return TRUE;
 		if(autocvar_g_pickup_items == 0)
 			return FALSE;
-		if(g_lms)
-			return FALSE;
 		if(g_ca)
 			return FALSE;
 		if(g_weaponarena)
@@ -624,12 +620,12 @@ float Item_GiveTo(entity item, entity player)
 		WEPSET_COPY_AE(it, item);
 		WEPSET_ANDNOT_AE(it, player);
 
-		if (!WEPSET_EMPTY_A(it) || (item.spawnshieldtime && self.pickup_anyway))
+		if (!WEPSET_EMPTY_A(it) || (item.spawnshieldtime && item.pickup_anyway))
 		{
-		pickedup = TRUE;
-		for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+			pickedup = TRUE;
+			for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 			if(WEPSET_CONTAINS_AW(it, i))
-			W_GiveWeapon(player, i);
+				W_GiveWeapon(player, i);
 		}
 	}