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

avoid InvalidOperation and NullReferenceException

Browse Source 
fixes #5522
This commit is contained in:
Matthias Mailänder
2014-06-01 18:26:26 +02:00
parent 366bda5fca
commit 1700a36286
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
View File

@@ -53,8 +53,11 @@ namespace OpenRA.Mods.RA.Buildings
Repairer = p; Repairer = p;
Sound.PlayNotification(self.World.Map.Rules, Repairer, "Speech", "Repairing", self.Owner.Country.Race); Sound.PlayNotification(self.World.Map.Rules, Repairer, "Speech", "Repairing", self.Owner.Country.Race);
self.World.AddFrameEndTask( self.World.AddFrameEndTask(w =>
w => w.Add(new RepairIndicator(self, Info.IndicatorPalettePrefix, p))); {
if (!self.IsDead())
w.Add(new RepairIndicator(self, Info.IndicatorPalettePrefix, p));
});
} }
} }
} }

6
OpenRA.Mods.RA/Effects/RepairIndicator.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Effects
this.player = player; this.player = player;
this.palettePrefix = palettePrefix; this.palettePrefix = palettePrefix;
rb = building.Trait<RepairableBuilding>(); rb = building.TraitOrDefault<RepairableBuilding>();
anim = new Animation(building.World, "allyrepair"); anim = new Animation(building.World, "allyrepair");
anim.PlayRepeating("repair"); anim.PlayRepeating("repair");
} }
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Effects
public void Tick(World world) public void Tick(World world)
{ {
if (!building.IsInWorld || building.IsDead() || if (!building.IsInWorld || building.IsDead() ||
rb.Repairer == null || rb.Repairer != player) rb == null || rb.Repairer == null || rb.Repairer != player)
world.AddFrameEndTask(w => w.Remove(this)); world.AddFrameEndTask(w => w.Remove(this));
anim.Tick(); anim.Tick();