From: Mario <mario@smbclan.net>
Date: Mon, 3 Oct 2016 13:43:02 +0000 (+1000)
Subject: Don't explode projectiles if they have the same owner
X-Git-Tag: xonotic-v0.8.2~326^2~68^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d2641eb6c0303c2ed88888abbe410acdf3f38f0;p=xonotic%2Fxonotic-data.pk3dir.git

Don't explode projectiles if they have the same owner
---

diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc
index 964877425..ce7bbc3f9 100644
--- a/qcsrc/common/weapons/weapon/hook.qc
+++ b/qcsrc/common/weapons/weapon/hook.qc
@@ -379,7 +379,7 @@ void Draw_GrapplingHook(entity this)
 
 	InterpolateOrigin_Do(this);
 
-	int s = viewmodels[this.cnt].m_gunalign - 1; //W_GunAlign(NULL, STAT(GUNALIGN));
+	int s = W_GunAlign(viewmodels[this.cnt], STAT(GUNALIGN)) - 1;
 
 	switch(this.HookType)
 	{
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 0237a75ad..efb24f4e0 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1077,6 +1077,8 @@ bool WarpZone_Projectile_Touch_ImpactFilter_Callback(entity this, entity toucher
 {
 	if(SUB_OwnerCheck(this, toucher))
 		return true;
+	if(toucher.owner == this.owner)
+		return true;
 	if(SUB_NoImpactCheck(this, toucher))
 	{
 		if(this.classname == "nade")