X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=2fe7d512089e9e655b9d5a51491d03bb5ff53a73;hb=f291cdc835b56a498dd981b2e7e2bcfbfcf04ee3;hp=07c6b058b2475eead69dad1103e3d7d92fb40817;hpb=7d1125a36e0a538ca3682c8abb1bab2a98692a1f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 07c6b058b..2fe7d5120 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -142,6 +142,7 @@ void CopyBody(float keepvelocity)
 	self.movetype = oldself.movetype;
 	self.nextthink = oldself.nextthink;
 	self.solid = oldself.solid;
+	self.ballistics_density = oldself.ballistics_density;
 	self.takedamage = oldself.takedamage;
 	self.think = oldself.think;
 	self.customizeentityforclient = oldself.customizeentityforclient;
@@ -432,7 +433,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	else
 		Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
 
-	if((g_arena && numspawned < 2) || (g_ca && player_cnt < 2) && !inWarmupStage)
+	if((g_arena && numspawned < 2) || (g_ca && ca_players < required_ca_players) && !inWarmupStage)
 		return;
 
 	if (!g_minstagib)