Use Null-Propagation Operator

2020-08-16 11:38:14 +02:00
parent 8d27d22100
commit 9c4fd0e3d3
113 changed files with 219 additions and 464 deletions
--- a/OpenRA.Mods.Common/Scripting/Properties/GeneralProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/GeneralProperties.cs
@@ -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;
 			}
 		}