X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=4a5c8a00d2d4866e27f44f598ef3ba9e9942ae0b;hb=5b6514ad570d0210590f6fb10b6abd26df38cbd8;hp=8fd2b13e207a1eb214793d03aa1f30eadca520da;hpb=3d8bde328c6e100a69b1bf69edbc529f393873a7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 8fd2b13e2..4a5c8a00d 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -262,10 +262,6 @@ void player_anim (void)
 
 void SpawnThrownWeapon (vector org, float w)
 {
-	if(g_minstagib)
-	if(self.ammo_cells <= 0)
-		return;
-
 	if(g_pinata)
 	{
 		float j;
@@ -391,17 +387,10 @@ 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_minstagib)
-	{
-		v = healtharmor_applydamage(self.armorvalue, autocvar_g_balance_armor_blockpercent, damage);
-		take = v_x;
-		save = v_y;
-	}
-	else
-	{
-		save = 0;
-		take = damage;
-	}
+
+	v = healtharmor_applydamage(self.armorvalue, autocvar_g_balance_armor_blockpercent, damage);
+	take = v_x;
+	save = v_y;
 
 	if(attacker == self)
 	{
@@ -590,7 +579,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		// print an obituary message
 		Obituary (attacker, inflictor, self, deathtype);
 		race_PreDie();
-		DropAllRunes(self);
 
         // increment frag counter for used weapon type
         float w;