epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crashes with actors dying mid-projectile-flight

Browse Source
This commit is contained in:
Paul Chote
2010-09-09 17:18:43 +12:00
parent 9e53774299
commit 54ffdc51b4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.RA/AutoTarget.cs
View File

@@ -72,6 +72,7 @@ namespace OpenRA.Mods.RA
public void Damaged(Actor self, AttackInfo e) public void Damaged(Actor self, AttackInfo e)
{ {
if (!self.IsIdle) return; if (!self.IsIdle) return;
if (e.Attacker.Destroyed) return;
// not a lot we can do about things we can't hurt... although maybe we should automatically run away? // not a lot we can do about things we can't hurt... although maybe we should automatically run away?
var attack = self.Trait<AttackBase>(); var attack = self.Trait<AttackBase>();

2
OpenRA.Mods.RA/GivesExperience.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA
if (e.DamageState == DamageState.Dead) if (e.DamageState == DamageState.Dead)
{ {
// Prevent TK from giving exp // Prevent TK from giving exp
if (e.Attacker == null || e.Attacker.Owner.Stances[ self.Owner ] == Stance.Ally ) if (e.Attacker == null || e.Attacker.Destroyed || e.Attacker.Owner.Stances[ self.Owner ] == Stance.Ally )
return; return;
var info = self.Info.Traits.Get<GivesExperienceInfo>(); var info = self.Info.Traits.Get<GivesExperienceInfo>();