From: Mario <mario@smbclan.net>
Date: Sat, 20 Oct 2018 18:35:51 +0000 (+1000)
Subject: Never group loot items, and only throw overkill shards towards players
X-Git-Tag: xonotic-v0.8.5~1755
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e43068443a3d73fcd7d950a8f1a22571bfd92171;p=xonotic%2Fxonotic-data.pk3dir.git

Never group loot items, and only throw overkill shards towards players
---

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 9fa66e8b2a..c8e4398b0d 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -102,7 +102,7 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDies)
 	entity frag_attacker = M_ARGV(1, entity);
 	entity frag_target = M_ARGV(2, entity);
 
-	entity targ = ((frag_attacker) ? frag_attacker : frag_target);
+	entity targ = ((IS_PLAYER(frag_attacker)) ? frag_attacker : frag_target);
 
 	ok_DropItem(frag_target, targ);
 
diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index dfee5330df..9675816cc5 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -1401,7 +1401,7 @@ int group_count = 1;
 
 void setItemGroup(entity this)
 {
-	if(!IS_SMALL(this.itemdef))
+	if(!IS_SMALL(this.itemdef) || Item_IsLoot(this))
 		return;
 
 	FOREACH_ENTITY_RADIUS(this.origin, 120, (it != this) && IS_SMALL(it.itemdef),