From 3ef5e6c009290d96cffcc1ff8e8cedd8814a6fc9 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Sun, 6 Jan 2019 00:22:06 +0100
Subject: [PATCH] Fix the 'kill' command

---
 Source/Menu-FN/entry.cpp |   4 ++--
 Source/Server/Damage.c   |   8 ++++++--
 freecs/csprogs.dat       | Bin 260782 -> 260782 bytes
 freecs/menu.dat          | Bin 213266 -> 213266 bytes
 freecs/progs.dat         | Bin 289778 -> 289794 bytes
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/Menu-FN/entry.cpp b/Source/Menu-FN/entry.cpp
index 5c7eccc3..f9b10a08 100644
--- a/Source/Menu-FN/entry.cpp
+++ b/Source/Menu-FN/entry.cpp
@@ -133,7 +133,7 @@ float m_consolecommand(string cmd)
 			m_display();
 			break;
 		default:
-			return TRUE;
+			return FALSE;
 	}
-	return FALSE;
+	return TRUE;
 }
diff --git a/Source/Server/Damage.c b/Source/Server/Damage.c
index 59467fa8..e4c7db27 100755
--- a/Source/Server/Damage.c
+++ b/Source/Server/Damage.c
@@ -101,8 +101,12 @@ void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos
 	}
 	dprint( sprintf( "[DEBUG] Hit Bodypart: %s\n", Damage_GetHitLocation( trace_surface_id ) ) );
 
-	if ( Damage_ShouldDamage( eTarget.team, eAttacker.team ) == FALSE && autocvar_mp_friendlyfire == 0 ) {
-		return;
+	if (eTarget != eAttacker) {
+		if ( !Damage_ShouldDamage(eTarget.team, eAttacker.team)) {
+			if (!autocvar_mp_friendlyfire) {
+				return;
+			}
+		}
 	}
 
 	eTarget.velocity = [0,0,0];
diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat
index 9f61acba8a3ea15cd21ae4ba460b55d7e7462e40..a6e383123d4b084b40cf2762ca1256376ab3389f 100644
GIT binary patch
delta 23
fcmZ4Ym4Dq={t3m5W{oASC5){lOj}Est$qOje-8=i

delta 23
fcmZ4Ym4Dq={t3m5ri~@7C5){lOj}Est$qOje*p>T

diff --git a/freecs/menu.dat b/freecs/menu.dat
index 16e5439e0a7719ab42cea1f5dff10232830e3d47..e3ba64b5d4748ba914c97803272ecee8e3ff55a9 100755
GIT binary patch
delta 61
zcmbQ##5<{pcS13vSz}3S3FFohrcD}>N(>;7&d|>F_df%JEyF(`$-tn^pgg^ikJ+%j
NK$B^EfhO}JaR5a55wHLN

delta 59
zcmbQ##5<{pcS13vX=6!i3FFohrcD|`$_yZo&d|>F_df%JEyKV6(*?X4MW*-hF{`u}
NXfkat&}3dD4gff;5@G-V

diff --git a/freecs/progs.dat b/freecs/progs.dat
index 8c6efb68e7b4104848cb98c221adcf06670782a9..ae94e46d6c5b78adc12ff48e74516f9c557120cc 100644
GIT binary patch
delta 764
zcmXBSUr1AN6bJC%?_Ot&H192!L<xo)>B!n8(tPM4(8vcNiT;5G28AK6R!*H#R1z_2
z;)L-fK}0C1hd>|3lrmBhF^DJ{m9U2e7K1%hCL|bjzV!4teEA+Y59jAc`}QZ>*`$=(
zQ>N6zqgr*=iG!w^w3YJO1uAPOwV_QlYAQ7>y;AAyjXT?PKHj)b*G_e>Rl35#ia_mP
z(0e!N)v2J@IM-3URedN)mt?GEm9gAdx^L|C1eBKj|51TV0p%D9&OPl(ZHXB}U-TJ_
zT{bKA2<FHutdK&uuLwn`A*azo+7KoYJRnKTl4)egOSnQp6{<-Cn#n1INFNep1T$n3
z8L|L<RcL^Z97hvrMHjh<IEf)ip5ZfD#2=Ez?rXv~G?G<ZB7Vfk5T?i|(qta%<SWX%
zh2J<rj^P41fhf6wr(_)OhzDzAJ9dPHG8`s;w3B|^A)E1p6yXgyfFC3WPmf@sp6o&!
ziQ*O+#v}3qO9HH3)51oNS*l;d?v?y44iW=rNdVVL2oq!+3uF;FQi0+=!3T%<agsQQ
zkV6<F^_U~mSRpyMBSIcEWECys7s3LbN92yj5xHX>v&{b@OWbhv3l^$L2b#%Egh&(#
mlE4g^K!&`B9uSt{Bjso!`_V;O5hv$U$pN$Odtttl@AnUWP~}zt

delta 738
zcmWmCPe{{Y0LJn6x1S~oiNi^lD*~++sJX)$LLL$nIur;QXc!3@Nu*iRxy-;sMwBtB
z_*O7NNYI0kL=K^%KP>PdBoP_t!APV?Xu^UZq4zm`;Ndwuhv&wUck_!km}iXHzr&a(
zjgILI8*^{iHP5`p_`Er0)nm*r$2E^!V-mLKvmO6fu-I81Yp8ZYGm&h0ZhK@;O=!5Q
zBHmTuq`E3Rr_XaZ;qm8JIx9ufCg`c8XVO!a@{f8F-<*?7ce~|If<^I;tjMAClBIw;
z(M-EI#fXS9C7!b&X32=xl=N8kQ7h_c6DJrFeN2c1^WrHR;yvEWmU=?sI4z=;L2;IG
zaf`H=<A+GI{fgxiL9s@&$Pg0&lHxXR#RJyF8}cKT?^KCDG>JxfMH3IjHC~A%tD>0P
zUW<<dqJ(22K#%C>zQ|`z6tE(KIDM9N_KHG|ik(~(amK_QUWk``6(88L@UPD;q9*G4
zoCO-9HaB#NYDPsjGa|`nk>;=1&8~h+IY&f*4snp1;t<m!%%YejE7mEES$<L{GPH|L
zMnsk=3zIRsV>xDbY>`o(N6A%7A+_QhZQ?pZBF==k%e;8ZhWLngz_LV0l+hxp7!<9H
Si!-V8fE)h3ZTUiuz3YFTYT%dv