Use Null-Propagation Operator
This commit is contained in:
@@ -31,8 +31,7 @@ namespace OpenRA.Mods.Common.Activities
|
||||
{
|
||||
try
|
||||
{
|
||||
if (function != null)
|
||||
function.Call().Dispose();
|
||||
function?.Call().Dispose();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -29,14 +29,7 @@ namespace OpenRA.Mods.Common.Scripting
|
||||
[Desc("Creates a new radar ping that stays for the specified time at the specified WPos.")]
|
||||
public void Ping(Player player, WPos position, Color color, int duration = 30 * 25)
|
||||
{
|
||||
if (radarPings != null)
|
||||
{
|
||||
radarPings.Add(
|
||||
() => player.World.RenderPlayer == player,
|
||||
position,
|
||||
color,
|
||||
duration);
|
||||
}
|
||||
radarPings?.Add(() => player.World.RenderPlayer == player, position, color, duration);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,8 +54,7 @@ namespace OpenRA.Mods.Common.Scripting
|
||||
if (disposed)
|
||||
return;
|
||||
|
||||
if (context != null)
|
||||
context.Dispose();
|
||||
context?.Dispose();
|
||||
|
||||
disposed = true;
|
||||
}
|
||||
|
||||
@@ -172,10 +172,7 @@ namespace OpenRA.Mods.Common.Scripting
|
||||
{
|
||||
get
|
||||
{
|
||||
if (autotarget == null)
|
||||
return null;
|
||||
|
||||
return autotarget.Stance.ToString();
|
||||
return autotarget?.Stance.ToString();
|
||||
}
|
||||
|
||||
set
|
||||
@@ -197,10 +194,8 @@ namespace OpenRA.Mods.Common.Scripting
|
||||
get
|
||||
{
|
||||
var tooltip = tooltips.FirstEnabledTraitOrDefault();
|
||||
if (tooltip == null)
|
||||
return null;
|
||||
|
||||
return tooltip.Info.Name;
|
||||
return tooltip?.Info.Name;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user