From: LegendaryGuard <rootuser999@gmail.com>
Date: Sat, 29 May 2021 11:18:35 +0000 (+0200)
Subject: Fix emerald nade when spawning weapons in CA, FT and LMS
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=355866522ea7554cfe9ff55478446f11533538bf;p=xonotic%2Fxonotic-data.pk3dir.git

Fix emerald nade when spawning weapons in CA, FT and LMS
---

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 95b49ec1d..4605dd794 100644
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -796,7 +796,12 @@ void nade_emerald_randomitem(entity e, vector org)
 		else if (c < 0.5)
 			nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shield : ITEM_Strength));
 		else
-			nade_emerald_randomweapons(e, org);
+		{
+			if(!g_ca || !g_freezetag)
+				nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall));
+			else
+				nade_emerald_randomweapons(e, org);
+		}
 	}
 	else
 	{
@@ -805,7 +810,12 @@ void nade_emerald_randomitem(entity e, vector org)
 		else if (d < 0.2)
 			nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_Shells : ITEM_Rockets));
 		else
-			nade_emerald_randomweapons(e, org);
+		{
+			if(!g_ca || !g_freezetag)
+				nade_emerald_dropitem(e, org, ((random() > 0.5) ? ITEM_ArmorSmall : ITEM_HealthSmall));
+			else
+				nade_emerald_randomweapons(e, org);
+		}
 		return;
 	}
 }