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

Add null check to Actor.Crushables

Browse Source
This commit is contained in:
atlimit8
2024-02-08 23:29:01 -06:00
committed by Gustas
parent 2fe13fe442
commit 8993901641
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Actor.cs
View File

@@ -72,7 +72,11 @@ namespace OpenRA
public IOccupySpace OccupiesSpace { get; } public IOccupySpace OccupiesSpace { get; }
public ITargetable[] Targetables { get; } public ITargetable[] Targetables { get; }
public IEnumerable<ITargetablePositions> EnabledTargetablePositions { get; } public IEnumerable<ITargetablePositions> EnabledTargetablePositions { get; }
public ICrushable[] Crushables { get; } readonly ICrushable[] crushables;
public ICrushable[] Crushables
{
get => crushables ?? throw new InvalidOperationException($"Crushables for {Info.Name} are not initialized.");
}
public bool IsIdle => CurrentActivity == null; public bool IsIdle => CurrentActivity == null;
public bool IsDead => Disposed || (health != null && health.IsDead); public bool IsDead => Disposed || (health != null && health.IsDead);
@@ -198,7 +202,7 @@ namespace OpenRA
EnabledTargetablePositions = targetablePositions.Where(Exts.IsTraitEnabled); EnabledTargetablePositions = targetablePositions.Where(Exts.IsTraitEnabled);
enabledTargetableWorldPositions = EnabledTargetablePositions.SelectMany(tp => tp.TargetablePositions(this)); enabledTargetableWorldPositions = EnabledTargetablePositions.SelectMany(tp => tp.TargetablePositions(this));
SyncHashes = syncHashesList.ToArray(); SyncHashes = syncHashesList.ToArray();
Crushables = crushablesList.ToArray(); crushables = crushablesList.ToArray();
} }
} }