X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fbuffs%2Fsv_buffs.qc;h=5587da593796e32e6e6afee3d91d84ec4ac14a18;hb=97cbca4fc1745460133e1bcde48bbc02f7671a53;hp=d9223b302a13b771f34e11b55c8bb7077e08f01c;hpb=e424ba544c41fc40b241b17bd7c1d9c2fc930705;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index d9223b302..5587da593 100644
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@ -216,7 +216,7 @@ void buff_NewType(entity ent, float cb)
 	FOREACH(Buffs, buff_Available(it), LAMBDA(
 		it.buff_seencount += 1;
 		// if it's already been chosen, give it a lower priority
-		RandomSelection_Add(NULL, it.m_itemid, string_null, 1, max(0.2, 1 / it.buff_seencount));
+		RandomSelection_AddFloat(it.m_itemid, 1, max(0.2, 1 / it.buff_seencount));
 	));
 	ent.buffs = RandomSelection_chosen_float;
 }
@@ -345,6 +345,10 @@ void buff_Init(entity this)
 	this.classname = "item_buff";
 	this.solid = SOLID_TRIGGER;
 	this.flags = FL_ITEM;
+	this.bot_pickup = true;
+	this.bot_pickupevalfunc = commodity_pickupevalfunc;
+	this.bot_pickupbasevalue = 1000;
+	IL_PUSH(g_items, this);
 	setthink(this, buff_Think);
 	settouch(this, buff_Touch);
 	this.reset = buff_Reset;
@@ -822,7 +826,7 @@ MUTATOR_HOOKFUNCTION(buffs, PlayerPreThink)
 	if(player.buffs & BUFF_MAGNET.m_itemid)
 	{
 		vector pickup_size;
-		FOREACH_ENTITY_FLAGS(flags, FL_ITEM,
+		IL_EACH(g_items, it.classname != "item_flag_team" && it.classname != "item_kh_key",
 		{
 			if(it.buffs)
 				pickup_size = '1 1 1' * autocvar_g_buffs_magnet_range_buff;