check if the host building is gone

fixes #5670
2014-07-09 07:33:30 +02:00
parent c70087fdb2
commit 26ed4c24be
1 changed files with 4 additions and 2 deletions
--- a/OpenRA.Mods.RA/Activities/Rearm.cs
+++ b/OpenRA.Mods.RA/Activities/Rearm.cs
@@ -37,11 +37,13 @@ namespace OpenRA.Mods.RA.Activities
 				var hostBuilding = self.World.ActorMap.GetUnitsAt(self.Location)
 					.FirstOrDefault(a => a.HasTrait<RenderBuilding>());

+				if (hostBuilding == null || !hostBuilding.IsInWorld)
+					return NextActivity;
+
 				if (!limitedAmmo.GiveAmmo())
 					return NextActivity;

-				if (hostBuilding != null)
-					hostBuilding.Trait<RenderBuilding>().PlayCustomAnim(hostBuilding, "active");
+				hostBuilding.Trait<RenderBuilding>().PlayCustomAnim(hostBuilding, "active");

 				remainingTicks = limitedAmmo.ReloadTimePerAmmo();
 			}