From: Mario <mario@smbclan.net>
Date: Mon, 3 Oct 2016 14:57:33 +0000 (+1000)
Subject: Fix mines getting stuck at world origin
X-Git-Tag: xonotic-v0.8.2~326^2~64^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ec512d598ed26e15745767996c0eb84959dfdb8;p=xonotic%2Fxonotic-data.pk3dir.git

Fix mines getting stuck at world origin
---

diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc
index 9564462b8..0234cd157 100644
--- a/qcsrc/common/weapons/weapon/minelayer.qc
+++ b/qcsrc/common/weapons/weapon/minelayer.qc
@@ -296,9 +296,9 @@ void W_MineLayer_Touch(entity this, entity toucher)
 		return;
 	}
 
-	if(toucher && IS_PLAYER(toucher) && !IS_DEAD(toucher))
+	if((toucher && IS_PLAYER(toucher) && !IS_DEAD(toucher)) || toucher.owner == this.owner)
 	{
-		// hit a player
+		// hit a player or other mine
 		// don't stick
 	}
 	else