Skip to content

Commit

Permalink
Simplify fix for carcasses setting off grenades immediately (#474)
Browse files Browse the repository at this point in the history
  • Loading branch information
theastropath committed Jul 7, 2023
1 parent b4b2211 commit f2d85e7
Showing 1 changed file with 5 additions and 16 deletions.
21 changes: 5 additions & 16 deletions DXRBalance/DeusEx/Classes/ThrownProjectile.uc
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,10 @@ auto simulated state Flying
{
simulated function ProcessTouch (Actor Other, Vector HitLocation)
{
if (bStuck)
return;

if ((Other != instigator) && (DeusExProjectile(Other) == None) &&
(Other != Owner) && DeusExCarcass(Other)==None) //Ignore carcasses
{
damagee = Other;
Explode(HitLocation, Normal(HitLocation-damagee.Location));

// DEUS_EX AMSD Spawn blood server side only
if (Role == ROLE_Authority)
{
if (damagee.IsA('Pawn') && !damagee.IsA('Robot') && bBlood)
SpawnBlood(HitLocation, Normal(HitLocation-damagee.Location));
}
}
if (DeusExCarcass(Other)!=None){
return;
} else {
Super.ProcessTouch(Other,HitLocation);
}
}
}

0 comments on commit f2d85e7

Please sign in to comment.