Use Null-Propagation Operator

This commit is contained in:
teinarss
2020-08-16 11:38:14 +02:00
committed by Paul Chote
parent 8d27d22100
commit 9c4fd0e3d3
113 changed files with 219 additions and 464 deletions

View File

@@ -96,17 +96,10 @@ namespace OpenRA.Mods.Common.Effects
arrowSpeed *= -1;
}
if (arrow != null)
arrow.Tick();
if (beacon != null)
beacon.Tick();
if (circles != null)
circles.Tick();
if (clock != null)
clock.Tick();
arrow?.Tick();
beacon?.Tick();
circles?.Tick();
clock?.Tick();
if (duration > 0 && duration <= tick++)
owner.World.AddFrameEndTask(w => w.Remove(this));

View File

@@ -48,18 +48,15 @@ namespace OpenRA.Mods.Common.Effects
void IEffect.Tick(World world)
{
if (flag != null)
flag.Tick();
flag?.Tick();
if (circles != null)
circles.Tick();
circles?.Tick();
if (cachedLocations == null || !cachedLocations.SequenceEqual(rp.Path))
{
UpdateTargetLineNodes(world);
if (circles != null)
circles.Play(rp.Info.CirclesSequence);
circles?.Play(rp.Info.CirclesSequence);
}
if (!building.IsInWorld || building.IsDead)