X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_hagar.qc;h=76103f347e34fa50c6d16c849f6ee0dc0c15f2ac;hb=26ec33d6d19e627b43ac2cb51f83f890b5176293;hp=e6467e4549a60d8c7779845f467c7c3339da8a03;hpb=37ff2a84b803701be464173fb557c80b2cf60f46;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index e6467e454..76103f347 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -25,7 +25,7 @@ void W_Hagar_Damage (entity inflictor, entity attacker, float damage, float deat if (self.health <= 0) return; - float is_linkexplode = ((inflictor.realowner == self.realowner) + float is_linkexplode = ( ((inflictor.owner != world) ? (inflictor.owner == self.owner) : TRUE) && (inflictor.projectiledeathtype & HITTYPE_SECONDARY) && (self.projectiledeathtype & HITTYPE_SECONDARY)); @@ -33,7 +33,7 @@ void W_Hagar_Damage (entity inflictor, entity attacker, float damage, float deat is_linkexplode = (is_linkexplode && autocvar_g_balance_hagar_secondary_load_linkexplode); else is_linkexplode = -1; // not secondary load, so continue as normal without exception. - + if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, is_linkexplode)) return; // g_projectiles_damage says to halt