]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix mines getting stuck at world origin
authorMario <mario@smbclan.net>
Mon, 3 Oct 2016 14:57:33 +0000 (00:57 +1000)
committerMario <mario@smbclan.net>
Mon, 3 Oct 2016 14:57:33 +0000 (00:57 +1000)
qcsrc/common/weapons/weapon/minelayer.qc

index 9564462b86205fc8609f069bdd4466e424e91270..0234cd15743fe131b37350ff352925a87cecc340 100644 (file)
@@ -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