From: Mario <mario@smbclan.net>
Date: Sat, 24 Jun 2017 00:43:45 +0000 (+1000)
Subject: Fix a crash from clones dying
X-Git-Tag: xonotic-v0.8.5~2704
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca0aabda083082e8220b8ff68603e82458b5c025;p=xonotic%2Fxonotic-data.pk3dir.git

Fix a crash from clones dying
---

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 5aae35599..faba40f3f 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -311,7 +311,6 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 {
 	float take, save, dh, da;
 	vector v;
-	float valid_damage_for_weaponstats;
 	float excess;
 
 	dh = max(this.health, 0);
@@ -484,7 +483,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 	bool abot = (IS_BOT_CLIENT(attacker));
 	bool vbot = (IS_BOT_CLIENT(this));
 
-	valid_damage_for_weaponstats = 0;
+	bool valid_damage_for_weaponstats = false;
 	Weapon awep = WEP_Null;
 	.entity weaponentity = weaponentities[0]; // TODO: unhardcode
 
@@ -497,7 +496,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 			awep = attacker.(weaponentity).m_weapon;
 		else
 			awep = DEATH_WEAPONOF(deathtype);
-		valid_damage_for_weaponstats = 1;
+		valid_damage_for_weaponstats = true;
 	}
 
 	dh = dh - max(this.health, 0);
@@ -560,10 +559,13 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		MUTATOR_CALLHOOK(PlayerDies, inflictor, attacker, this, deathtype, damage);
 		excess = M_ARGV(4, float);
 
-		Weapon wep = this.(weaponentity).m_weapon;
+		//Weapon wep = this.(weaponentity).m_weapon;
 		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 		{
 			.entity went = weaponentities[slot];
+			if(!this.(weaponentity))
+				continue; // TODO: clones have no weapon, but we don't want to have to check this all the time
+			Weapon wep = this.(weaponentity).m_weapon;
 			wep.wr_playerdeath(wep, this, went);
 		}
 
@@ -649,13 +651,17 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		}
 
 		// reset fields the weapons may use just in case
-		FOREACH(Weapons, it != WEP_Null, LAMBDA(
-			it.wr_resetplayer(it, this);
-			for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+		if(this.classname != "body")
+		{
+			FOREACH(Weapons, it != WEP_Null,
 			{
-				ATTACK_FINISHED_FOR(this, it.m_id, slot) = 0;
-			}
-		));
+				it.wr_resetplayer(it, this);
+				for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+				{
+					ATTACK_FINISHED_FOR(this, it.m_id, slot) = 0;
+				}
+			});
+		}
 		MUTATOR_CALLHOOK(PlayerDied, this);
 	}
 }