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

Use Null-Propagation Operator

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
View File

@@ -128,8 +128,8 @@ namespace OpenRA.Mods.Common.Activities
return true;
// AbortOnResupply cancels the current activity (after resupplying) plus any queued activities
if (attackAircraft.Info.AbortOnResupply && NextActivity != null)
NextActivity.Cancel(self);
if (attackAircraft.Info.AbortOnResupply)
NextActivity?.Cancel(self);
QueueChild(new ReturnToBase(self));
returnToBase = true;

6
OpenRA.Mods.Common/Activities/CaptureActor.cs
View File

@@ -112,11 +112,7 @@ namespace OpenRA.Mods.Common.Activities
t.OnCapture(enterActor, self, oldOwner, self.Owner, captures.Info.CaptureTypes);
if (self.Owner.Stances[oldOwner].HasStance(captures.Info.PlayerExperienceStances))
{
var exp = self.Owner.PlayerActor.TraitOrDefault<PlayerExperience>();
if (exp != null)
exp.GiveExperience(captures.Info.PlayerExperience);
}
self.Owner.PlayerActor.TraitOrDefault<PlayerExperience>()?.GiveExperience(captures.Info.PlayerExperience);
if (captures.Info.ConsumedByCapture)
self.Dispose();

3
OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -177,8 +177,7 @@ namespace OpenRA.Mods.Common.Activities
if (IsCanceling && mobile.CanStayInCell(mobile.ToCell))
{
if (path != null)
path.Clear();
path?.Clear();
return true;
}

10
OpenRA.Mods.Common/Activities/Resupply.cs
View File

@@ -138,9 +138,7 @@ namespace OpenRA.Mods.Common.Activities
QueueChild(move.MoveTo(targetCell, targetLineColor: Color.Green));
var delta = (self.CenterPosition - host.CenterPosition).LengthSquared;
var transport = transportCallers.FirstOrDefault(t => t.MinimumDistance.LengthSquared < delta);
if (transport != null)
transport.RequestTransport(self, targetCell);
transportCallers.FirstOrDefault(t => t.MinimumDistance.LengthSquared < delta)?.RequestTransport(self, targetCell);
return false;
}
@@ -261,11 +259,7 @@ namespace OpenRA.Mods.Common.Activities
if (health.DamageState == DamageState.Undamaged)
{
if (host.Actor.Owner != self.Owner)
{
var exp = host.Actor.Owner.PlayerActor.TraitOrDefault<PlayerExperience>();
if (exp != null)
exp.GiveExperience(repairsUnits.Info.PlayerExperience);
}
host.Actor.Owner.PlayerActor.TraitOrDefault<PlayerExperience>()?.GiveExperience(repairsUnits.Info.PlayerExperience);
Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", repairsUnits.Info.FinishRepairingNotification, self.Owner.Faction.InternalName);