]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
To be extra safe, also make sure it isn't an electro orb from another player
authorMario <mario@smbclan.net>
Tue, 26 Dec 2017 10:18:18 +0000 (20:18 +1000)
committerMario <mario@smbclan.net>
Tue, 26 Dec 2017 10:18:18 +0000 (20:18 +1000)
qcsrc/common/weapons/weapon/electro.qc

index 49bb16a44576fdbbd34144cbf246a4b730f5d90d..05f306174dae307cd024d8518f77a20b39c30155 100644 (file)
@@ -281,7 +281,7 @@ void W_Electro_Orb_Touch(entity this, entity toucher)
        PROJECTILE_TOUCH(this, toucher);
        if(toucher.takedamage == DAMAGE_AIM)
                { if(WEP_CVAR_SEC(electro, touchexplode)) { W_Electro_Explode(this, toucher); } }
-       else if(toucher.owner != this.owner) // don't stick to player's other projectiles!
+       else if(toucher.owner != this.owner && toucher.classname != this.classname) // don't stick to player's other projectiles!
        {
                //UpdateCSQCProjectile(this);
                spamsound(this, CH_SHOTS, SND_ELECTRO_BOUNCE, VOL_BASE, ATTEN_NORM);