X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fbuffs%2Fsv_buffs.qc;h=73c24576ce0f53aa23865cefabd940d449366184;hp=4be441dc1096106c0b4db2c1836880d0596e14e9;hb=79c07d6f162c78d9a59a873f66a27a387d5722d7;hpb=0076d3f631e54b908b7506883c75c6d28f6b9505

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index 4be441dc1..73c24576c 100644
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@ -210,7 +210,7 @@ float buff_Available(entity buff)
 		return false;
 	if (buff == BUFF_VAMPIRE && cvar("g_vampire"))
 		return false;
-	return cvar(strcat("g_buffs_", buff.m_name));
+	return cvar(strcat("g_buffs_", buff.netname));
 }
 
 .int buff_seencount;
@@ -423,7 +423,7 @@ void buff_Medic_Heal(entity this)
 {
 	FOREACH_CLIENT(IS_PLAYER(it) && it != this && vdist(it.origin - this.origin, <=, autocvar_g_buffs_medic_heal_range),
 	{
-		if (!SAME_TEAM(it, this))
+		if (DIFF_TEAM(it, this))
 		{
 			continue;
 		}
@@ -494,10 +494,12 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate)
 
 	if(STAT(BUFFS, frag_attacker) & BUFF_BASH.m_itemid)
 	if(frag_force)
-	if(frag_attacker == frag_target)
-		frag_force *= autocvar_g_buffs_bash_force_self;
-	else
-		frag_force *= autocvar_g_buffs_bash_force;
+	{
+		if(frag_attacker == frag_target)
+			frag_force *= autocvar_g_buffs_bash_force_self;
+		else
+			frag_force *= autocvar_g_buffs_bash_force;
+	}
 
 	if(STAT(BUFFS, frag_attacker) & BUFF_DISABILITY.m_itemid)
 	if(frag_target != frag_attacker)
@@ -544,7 +546,7 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate)
 		float amount = bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal,
 			GetResourceAmount(frag_target, RESOURCE_HEALTH));
 		GiveResourceWithLimit(frag_attacker, RESOURCE_HEALTH, amount, g_pickup_healthsmall_max);
-		if (frag_target.armorvalue)
+		if (GetResourceAmount(frag_target, RESOURCE_ARMOR))
 		{
 			amount = bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal,
 				GetResourceAmount(frag_target, RESOURCE_ARMOR));
@@ -680,11 +682,21 @@ MUTATOR_HOOKFUNCTION(buffs, ForbidThrowCurrentWeapon)
 
 			closest.velocity = my_vel;
 			closest.angles = my_ang;
+			if (IS_BOT_CLIENT(closest))
+			{
+				closest.v_angle = closest.angles;
+				bot_aim_reset(closest);
+			}
 			closest.fixangle = true;
 			closest.oldorigin = my_org;
 			closest.oldvelocity = my_vel;
 			player.velocity = their_vel;
 			player.angles = their_ang;
+			if (IS_BOT_CLIENT(player))
+			{
+				player.v_angle = player.angles;
+				bot_aim_reset(player);
+			}
 			player.fixangle = true;
 			player.oldorigin = their_org;
 			player.oldvelocity = their_vel;