mirror of
https://github.com/nzp-team/quakec.git
synced 2025-03-07 01:51:09 +00:00
SERVER: Fix for explosives thrown at other players harming attacker
This commit is contained in:
parent
7b7c86f31d
commit
b58b25de5e
1 changed files with 2 additions and 2 deletions
|
@ -574,7 +574,7 @@ void(entity inflictor, entity attacker, float damage2, float mindamage, float ra
|
||||||
|
|
||||||
while (ent != world)
|
while (ent != world)
|
||||||
{
|
{
|
||||||
if(ent.classname == "player")
|
if(ent.classname == "player" && ent == attacker) // we don't want OUR explosives to harm other players..
|
||||||
{
|
{
|
||||||
if (ent.perks & P_FLOP)
|
if (ent.perks & P_FLOP)
|
||||||
final_damage = 0;
|
final_damage = 0;
|
||||||
|
@ -601,7 +601,7 @@ void(entity inflictor, entity attacker, float damage2, float mindamage, float ra
|
||||||
final_damage /= radius;
|
final_damage /= radius;
|
||||||
final_damage *= 60;
|
final_damage *= 60;
|
||||||
}
|
}
|
||||||
DamageHandler (attacker, attacker, final_damage, S_EXPLOSIVE);
|
DamageHandler (ent, ent, final_damage, S_EXPLOSIVE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ent.classname == "explosive_barrel")
|
else if (ent.classname == "explosive_barrel")
|
||||||
|
|
Loading…
Reference in a new issue