Removes Friendly Fire from pets

This commit is contained in:
Josh 2017-10-21 11:12:14 -05:00 committed by GitHub
parent aec79de0d4
commit 3d88b2edf2

View File

@ -490,6 +490,12 @@ function NetDamage(int OriginalDamage, out int Damage, Pawn Injured, Controller
ClearTimer('CheckDamageDone'); ClearTimer('CheckDamageDone');
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( Damage>0 && InstigatedBy!=None )
{ {
if( KFPawn_Monster(Injured)!=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=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="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)) WebConfigs.Add((PropType=2,PropName="BonusGameFX",UIName="Bonus Game FX",UIDesc="List of custom FX to play on pong game.",NumElements=-1))
} }