From 3d88b2edf26eadf1c5ea025713254dca85f14db2 Mon Sep 17 00:00:00 2001 From: Josh <24308517+FreebaseJosh@users.noreply.github.com> Date: Sat, 21 Oct 2017 11:12:14 -0500 Subject: [PATCH] Removes Friendly Fire from pets --- ServerExtMut/Classes/ServerExtMut.uc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ServerExtMut/Classes/ServerExtMut.uc b/ServerExtMut/Classes/ServerExtMut.uc index 3ac4b75..7b277b1 100644 --- a/ServerExtMut/Classes/ServerExtMut.uc +++ b/ServerExtMut/Classes/ServerExtMut.uc @@ -490,6 +490,12 @@ function NetDamage(int OriginalDamage, out int Damage, Pawn Injured, Controller ClearTimer('CheckDamageDone'); CheckDamageDone(); } + if ( KFPawn_Monster(Injured) != None && InstigatedBy != none && InstigatedBy.GetTeamNum() == Injured.GetTeamNum() ) + { + Momentum = vect(0,0,0); + Damage = 0; + return; + } if( Damage>0 && InstigatedBy!=None ) { if( KFPawn_Monster(Injured)!=None ) @@ -1595,4 +1601,4 @@ defaultproperties WebConfigs.Add((PropType=3,PropName="ServerMOTD",UIName="MOTD",UIDesc="Message of the Day")) WebConfigs.Add((PropType=2,PropName="BonusGameSongs",UIName="Bonus Game Songs",UIDesc="List of custom musics to play during level change pong game.",NumElements=-1)) WebConfigs.Add((PropType=2,PropName="BonusGameFX",UIName="Bonus Game FX",UIDesc="List of custom FX to play on pong game.",NumElements=-1)) -} \ No newline at end of file +}