From: LegendaryGuard <rootuser999@gmail.com>
Date: Sat, 2 Jul 2022 09:34:12 +0000 (+0000)
Subject: Merge branch 'Mario/pokenade_crash_fix' into 'master'
X-Git-Tag: xonotic-v0.8.6~438
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2f3d8bd6db089867619944460cb82d17ab6a2398;hp=4557ec2fa262ad06d963f34437cc25db91b85120

Merge branch 'Mario/pokenade_crash_fix' into 'master'

Merge branch Mario/pokenade_crash_fix (XS merge request)

Closes #2703

See merge request xonotic/xonotic-data.pk3dir!1041
---

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 5ea4cb49cf..2d0a234098 100644
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -675,9 +675,13 @@ void nade_heal_boom(entity this)
 
 void nade_monster_boom(entity this)
 {
+	if(!autocvar_g_monsters)
+		return;
 	entity e = spawn();
 	e.noalign = true; // don't drop to floor
 	e = spawnmonster(e, this.pokenade_type, MON_Null, this.realowner, this.realowner, this.origin, false, false, 1);
+	if(!e)
+		return; // monster failed to be spawned
 
 	if(autocvar_g_nades_pokenade_monster_lifetime > 0)
 		e.monster_lifetime = time + autocvar_g_nades_pokenade_monster_lifetime;
@@ -732,6 +736,11 @@ void nade_boom(entity this)
 			nade_blast = false;
 			break;
 		case NADE_TYPE_MONSTER:
+			if(!autocvar_g_monsters)
+			{
+				expef = EFFECT_NADE_EXPLODE(this.realowner.team);
+				break; // fall back to a standard nade explosion
+			}
 		case NADE_TYPE_SPAWN:
 			nade_blast = false;
 			switch(this.realowner.team)