From: Mario <mario@smbclan.net>
Date: Tue, 26 Dec 2017 10:18:18 +0000 (+1000)
Subject: To be extra safe, also make sure it isn't an electro orb from another player
X-Git-Tag: xonotic-v0.8.5~2408
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cf4dd1f36cdc53bc114c22d3a86c945518566992;p=xonotic%2Fxonotic-data.pk3dir.git

To be extra safe, also make sure it isn't an electro orb from another player
---

diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index 49bb16a44..05f306174 100644
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -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);