]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix electro orbs sticking to eachother in some cases
authorMario <mario@smbclan.net>
Tue, 26 Dec 2017 10:16:10 +0000 (20:16 +1000)
committerMario <mario@smbclan.net>
Tue, 26 Dec 2017 10:16:10 +0000 (20:16 +1000)
qcsrc/common/weapons/weapon/electro.qc

index 5aec7fef96367996a8a144268897a65cbfdbf5fa..49bb16a44576fdbbd34144cbf246a4b730f5d90d 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
+       else if(toucher.owner != this.owner) // don't stick to player's other projectiles!
        {
                //UpdateCSQCProjectile(this);
                spamsound(this, CH_SHOTS, SND_ELECTRO_BOUNCE, VOL_BASE, ATTEN_NORM);