Use Null-Propagation Operator

OpenRA.Game/Activities/Activity.cs

@@ -185,8 +185,7 @@ namespace OpenRA.Activities
 		/// </summary>
 		internal void OnActorDisposeOuter(Actor self)
 		{
-			if (ChildActivity != null)
-				ChildActivity.OnActorDisposeOuter(self);
+			ChildActivity?.OnActorDisposeOuter(self);
 
 			OnActorDispose(self);
 		}
@@ -199,8 +198,7 @@ namespace OpenRA.Activities
 			if (!IsInterruptible)
 				return;
 
-			if (ChildActivity != null)
-				ChildActivity.Cancel(self);
+			ChildActivity?.Cancel(self);
 
 			// Directly mark activities that are queued and therefore didn't run yet as done
 			State = State == ActivityState.Queued ? ActivityState.Done : ActivityState.Canceling;
@@ -243,11 +241,9 @@ namespace OpenRA.Activities
 
 				Console.WriteLine(GetType().ToString().Split('.').Last());
 
-				if (ChildActivity != null)
-					ChildActivity.PrintActivityTree(self, origin, level + 1);
+				ChildActivity?.PrintActivityTree(self, origin, level + 1);
 
-				if (NextActivity != null)
-					NextActivity.PrintActivityTree(self, origin, level);
+				NextActivity?.PrintActivityTree(self, origin, level);
 			}
 		}
 

OpenRA.Game/Activities/CallFunc.cs

@@ -26,7 +26,7 @@ namespace OpenRA.Activities
 
 		public override bool Tick(Actor self)
 		{
-			if (a != null) a();
+			a?.Invoke();
 			return true;
 		}
 	}

OpenRA.Game/Actor.cs

@@ -329,8 +329,7 @@ namespace OpenRA
 
 		public void CancelActivity()
 		{
-			if (CurrentActivity != null)
-				CurrentActivity.Cancel(this);
+			CurrentActivity?.Cancel(this);
 		}
 
 		public override int GetHashCode()
@@ -382,8 +381,7 @@ namespace OpenRA
 		{
 			// If CurrentActivity isn't null, run OnActorDisposeOuter in case some cleanups are needed.
 			// This should be done before the FrameEndTask to avoid dependency issues.
-			if (CurrentActivity != null)
-				CurrentActivity.OnActorDisposeOuter(this);
+			CurrentActivity?.OnActorDisposeOuter(this);
 
 			// Allow traits/activities to prevent a race condition when they depend on disposing the actor (e.g. Transforms)
 			WillDispose = true;
@@ -402,8 +400,7 @@ namespace OpenRA
 				World.TraitDict.RemoveActor(this);
 				Disposed = true;
 
-				if (luaInterface != null)
-					luaInterface.Value.OnActorDestroyed();
+				luaInterface?.Value.OnActorDestroyed();
 			});
 		}
 

OpenRA.Game/Download.cs

@@ -90,8 +90,7 @@ namespace OpenRA
 		public void CancelAsync()
 		{
 			lock (syncObject)
-				if (wc != null)
-					wc.CancelAsync();
+				wc?.CancelAsync();
 		}
 	}
 }

OpenRA.Game/FieldLoader.cs

@@ -179,8 +179,7 @@ namespace OpenRA
 
 		public static object GetValue(string fieldName, Type fieldType, MiniYaml yaml, MemberInfo field)
 		{
-			var value = yaml.Value;
-			if (value != null) value = value.Trim();
+			var value = yaml.Value?.Trim();
 
 			if (fieldType == typeof(int))
 			{

OpenRA.Game/FileSystem/FileSystem.cs

@@ -197,10 +197,7 @@ namespace OpenRA.FileSystem
 			var package = fileIndex[filename]
 				.LastOrDefault(x => x.Contains(filename));
 
-			if (package != null)
-				return package.GetStream(filename);
-
-			return null;
+			return package?.GetStream(filename);
 		}
 
 		public Stream Open(string filename)

OpenRA.Game/FileSystem/ZipFile.cs

@@ -66,8 +66,7 @@ namespace OpenRA.FileSystem
 
 			public void Dispose()
 			{
-				if (pkg != null)
-					pkg.Close();
+				pkg?.Close();
 			}
 
 			public IReadOnlyPackage OpenPackage(string filename, FileSystem context)

OpenRA.Game/Game.cs

@@ -80,7 +80,7 @@ namespace OpenRA
 
 		static void JoinInner(OrderManager om)
 		{
-			if (OrderManager != null) OrderManager.Dispose();
+			OrderManager?.Dispose();
 			OrderManager = om;
 			lastConnectionState = ConnectionState.PreConnecting;
 			ConnectionStateChanged(OrderManager);
@@ -154,8 +154,7 @@ namespace OpenRA
 		internal static void StartGame(string mapUID, WorldType type)
 		{
 			// Dispose of the old world before creating a new one.
-			if (worldRenderer != null)
-				worldRenderer.Dispose();
+			worldRenderer?.Dispose();
 
 			Cursor.SetCursor(null);
 			BeforeGameStart();
@@ -330,11 +329,9 @@ namespace OpenRA
 					Log.Write("graphics", "{0}", e);
 					Console.WriteLine("Renderer initialization failed. Check graphics.log for details.");
 
-					if (Renderer != null)
-						Renderer.Dispose();
+					Renderer?.Dispose();
 
-					if (Sound != null)
-						Sound.Dispose();
+					Sound?.Dispose();
 				}
 			}
 
@@ -388,13 +385,10 @@ namespace OpenRA
 
 			Ui.ResetAll();
 
-			if (worldRenderer != null)
-				worldRenderer.Dispose();
+			worldRenderer?.Dispose();
 			worldRenderer = null;
-			if (server != null)
-				server.Shutdown();
-			if (OrderManager != null)
-				OrderManager.Dispose();
+			server?.Shutdown();
+			OrderManager?.Dispose();
 
 			if (ModData != null)
 			{
@@ -430,8 +424,7 @@ namespace OpenRA
 			var grid = ModData.Manifest.Contains<MapGrid>() ? ModData.Manifest.Get<MapGrid>() : null;
 			Renderer.InitializeDepthBuffer(grid);
 
-			if (Cursor != null)
-				Cursor.Dispose();
+			Cursor?.Dispose();
 
 			Cursor = new CursorManager(ModData.CursorProvider);
 
@@ -446,8 +439,7 @@ namespace OpenRA
 
 			try
 			{
-				if (discoverNat != null)
-					discoverNat.Wait();
+				discoverNat?.Wait();
 			}
 			catch (Exception e)
 			{
@@ -610,8 +602,7 @@ namespace OpenRA
 						Sync.RunUnsynced(Settings.Debug.SyncCheckUnsyncedCode, world, () => world.TickRender(worldRenderer));
 				}
 
-				if (benchmark != null)
-					benchmark.Tick(LocalTick);
+				benchmark?.Tick(LocalTick);
 			}
 		}
 
@@ -836,12 +827,10 @@ namespace OpenRA
 			finally
 			{
 				// Ensure that the active replay is properly saved
-				if (OrderManager != null)
-					OrderManager.Dispose();
+				OrderManager?.Dispose();
 			}
 
-			if (worldRenderer != null)
-				worldRenderer.Dispose();
+			worldRenderer?.Dispose();
 			ModData.Dispose();
 			ChromeProvider.Deinitialize();
 
@@ -880,8 +869,7 @@ namespace OpenRA
 
 		public static void Disconnect()
 		{
-			if (OrderManager.World != null)
-				OrderManager.World.TraitDict.PrintReport();
+			OrderManager.World?.TraitDict.PrintReport();
 
 			OrderManager.Dispose();
 			CloseServer();
@@ -890,8 +878,7 @@ namespace OpenRA
 
 		public static void CloseServer()
 		{
-			if (server != null)
-				server.Shutdown();
+			server?.Shutdown();
 		}
 
 		public static T CreateObject<T>(string name)

OpenRA.Game/Graphics/Animation.cs

@@ -156,7 +156,7 @@ namespace OpenRA.Graphics
 				{
 					frame = CurrentSequence.Length - 1;
 					tickFunc = () => { };
-					if (after != null) after();
+					after?.Invoke();
 				}
 			};
 		}

OpenRA.Game/Graphics/Sheet.cs

@@ -146,8 +146,7 @@ namespace OpenRA.Graphics
 
 		public void Dispose()
 		{
-			if (texture != null)
-				texture.Dispose();
+			texture?.Dispose();
 		}
 	}
 }

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -97,8 +97,8 @@ namespace OpenRA.Graphics
 				var oldHeight = palette.Height;
 				palette.AddPalette(name, pal, allowModifiers);
 
-				if (oldHeight != palette.Height && PaletteInvalidated != null)
-					PaletteInvalidated();
+				if (oldHeight != palette.Height)
+					PaletteInvalidated?.Invoke();
 			}
 		}
 
@@ -258,8 +258,7 @@ namespace OpenRA.Graphics
 			if (enableDepthBuffer)
 				Game.Renderer.Context.EnableDepthBuffer();
 
-			if (terrainRenderer != null)
-				terrainRenderer.RenderTerrain(this, Viewport);
+			terrainRenderer?.RenderTerrain(this, Viewport);
 
 			Game.Renderer.Flush();
 

OpenRA.Game/InstalledMods.cs

@@ -78,8 +78,7 @@ namespace OpenRA
 				Log.Write("debug", "Load mod '{0}': {1}".F(path, e));
 			}
 
-			if (package != null)
-				package.Dispose();
+			package?.Dispose();
 
 			return null;
 		}

OpenRA.Game/LocalPlayerProfile.cs

@@ -108,8 +108,7 @@ namespace OpenRA
 				}
 				finally
 				{
-					if (onComplete != null)
-						onComplete();
+					onComplete?.Invoke();
 				}
 			};
 

OpenRA.Game/Manifest.cs

@@ -245,8 +245,7 @@ namespace OpenRA
 			foreach (var module in modules)
 			{
 				var disposableModule = module as IDisposable;
-				if (disposableModule != null)
-					disposableModule.Dispose();
+				disposableModule?.Dispose();
 			}
 		}
 	}

OpenRA.Game/Map/CellLayer.cs

@@ -73,8 +73,7 @@ namespace OpenRA
 			{
 				entries[Index(cell)] = value;
 
-				if (CellEntryChanged != null)
-					CellEntryChanged(cell);
+				CellEntryChanged?.Invoke(cell);
 			}
 		}
 
@@ -90,8 +89,7 @@ namespace OpenRA
 			{
 				entries[Index(uv)] = value;
 
-				if (CellEntryChanged != null)
-					CellEntryChanged(uv.ToCPos(GridType));
+				CellEntryChanged?.Invoke(uv.ToCPos(GridType));
 			}
 		}
 

OpenRA.Game/Map/MapCache.cs

@@ -111,8 +111,7 @@ namespace OpenRA
 					}
 					catch (Exception e)
 					{
-						if (mapPackage != null)
-							mapPackage.Dispose();
+						mapPackage?.Dispose();
 						Console.WriteLine("Failed to load map: {0}", map);
 						Console.WriteLine("Details: {0}", e);
 						Log.Write("debug", "Failed to load map: {0}", map);
@@ -192,8 +191,7 @@ namespace OpenRA
 					foreach (var p in maps.Values)
 						p.UpdateRemoteSearch(MapStatus.Unavailable, null);
 
-					if (queryFailed != null)
-						queryFailed();
+					queryFailed?.Invoke();
 
 					return;
 				}
@@ -213,8 +211,7 @@ namespace OpenRA
 				{
 					Log.Write("debug", "Can't parse remote map search data:\n{0}", data);
 					Log.Write("debug", "Exception: {0}", e);
-					if (queryFailed != null)
-						queryFailed();
+					queryFailed?.Invoke();
 				}
 			};
 
@@ -298,8 +295,7 @@ namespace OpenRA
 				Game.RunAfterTick(() =>
 				{
 					// Wait for any existing thread to exit before starting a new one.
-					if (previewLoaderThread != null)
-						previewLoaderThread.Join();
+					previewLoaderThread?.Join();
 
 					previewLoaderThread = new Thread(LoadAsyncInternal)
 					{

OpenRA.Game/Map/MapPreview.cs

@@ -412,8 +412,7 @@ namespace OpenRA
 				if (innerData.Preview != null)
 					cache.CacheMinimap(this);
 
-				if (parseMetadata != null)
-					parseMetadata(this);
+				parseMetadata?.Invoke(this);
 			}
 
 			// Update the status and class unconditionally
@@ -522,9 +521,7 @@ namespace OpenRA
 		public void Delete()
 		{
 			Invalidate();
-			var deleteFromPackage = parentPackage as IReadWritePackage;
-			if (deleteFromPackage != null)
-				deleteFromPackage.Delete(Package.Name);
+			(parentPackage as IReadWritePackage)?.Delete(Package.Name);
 		}
 
 		Stream IReadOnlyFileSystem.Open(string filename)

OpenRA.Game/ModData.cs

@@ -177,8 +177,7 @@ namespace OpenRA
 
 		public Map PrepareMap(string uid)
 		{
-			if (LoadScreen != null)
-				LoadScreen.Display();
+			LoadScreen?.Display();
 
 			if (MapCache[uid].Status != MapStatus.Available)
 				throw new InvalidDataException("Invalid map uid: {0}".F(uid));
@@ -202,12 +201,10 @@ namespace OpenRA
 
 		public void Dispose()
 		{
-			if (LoadScreen != null)
-				LoadScreen.Dispose();
+			LoadScreen?.Dispose();
 			MapCache.Dispose();
 
-			if (ObjectCreator != null)
-				ObjectCreator.Dispose();
+			ObjectCreator?.Dispose();
 
 			Manifest.Dispose();
 		}

OpenRA.Game/Network/Connection.cs

@@ -174,23 +174,21 @@ namespace OpenRA.Network
 			foreach (var p in packets)
 			{
 				packetFn(p.FromClient, p.Data);
-				if (Recorder != null)
-					Recorder.Receive(p.FromClient, p.Data);
+				Recorder?.Receive(p.FromClient, p.Data);
 			}
 		}
 
 		public void StartRecording(Func<string> chooseFilename)
 		{
 			// If we have a previous recording then save/dispose it and start a new one.
-			if (Recorder != null)
-				Recorder.Dispose();
+			Recorder?.Dispose();
 			Recorder = new ReplayRecorder(chooseFilename);
 		}
 
 		protected virtual void Dispose(bool disposing)
 		{
-			if (disposing && Recorder != null)
-				Recorder.Dispose();
+			if (disposing)
+				Recorder?.Dispose();
 		}
 
 		public void Dispose()
@@ -372,8 +370,7 @@ namespace OpenRA.Network
 
 			// Closing the stream will cause any reads on the receiving thread to throw.
 			// This will mark the connection as no longer connected and the thread will terminate cleanly.
-			if (tcp != null)
-				tcp.Close();
+			tcp?.Close();
 
 			base.Dispose(disposing);
 		}

OpenRA.Game/Network/OrderManager.cs

@@ -206,8 +206,7 @@ namespace OpenRA.Network
 		public void Dispose()
 		{
 			disposed = true;
-			if (Connection != null)
-				Connection.Dispose();
+			Connection?.Dispose();
 		}
 	}
 

OpenRA.Game/Network/ReplayRecorder.cs

@@ -100,8 +100,7 @@ namespace OpenRA.Network
 				Metadata.Write(writer);
 			}
 
-			if (preStartBuffer != null)
-				preStartBuffer.Dispose();
+			preStartBuffer?.Dispose();
 			writer.Close();
 		}
 	}

OpenRA.Game/Network/UnitOrders.cs

@@ -145,8 +145,7 @@ namespace OpenRA.Network
 						var data = MiniYaml.FromString(order.TargetString)[0];
 						var traitIndex = int.Parse(data.Key);
 
-						if (world != null)
-							world.AddGameSaveTraitData(traitIndex, data.Value);
+						world?.AddGameSaveTraitData(traitIndex, data.Value);
 
 						break;
 					}

OpenRA.Game/ObjectCreator.cs

@@ -67,10 +67,7 @@ namespace OpenRA
 				if (a.FullName == e.Name)
 					return a;
 
-			if (assemblies == null)
-				return null;
-
-			return assemblies.Select(a => a.Assembly).FirstOrDefault(a => a.FullName == e.Name);
+			return assemblies?.Select(a => a.Assembly).FirstOrDefault(a => a.FullName == e.Name);
 		}
 
 		// Only used by the linter to prevent exceptions from being thrown during a lint run

OpenRA.Game/Renderer.cs

@@ -115,8 +115,7 @@ namespace OpenRA
 					font.Dispose();
 			using (new PerfTimer("SpriteFonts"))
 			{
-				if (fontSheetBuilder != null)
-					fontSheetBuilder.Dispose();
+				fontSheetBuilder?.Dispose();
 				fontSheetBuilder = new SheetBuilder(SheetType.BGRA, 512);
 				Fonts = modData.Manifest.Get<Fonts>().FontList.ToDictionary(x => x.Key,
 					x => new SpriteFont(x.Value.Font, modData.DefaultFileSystem.Open(x.Value.Font).ReadAllBytes(),
@@ -156,8 +155,7 @@ namespace OpenRA
 
 			if (screenSprite == null || screenSprite.Sheet.Size != surfaceBufferSize)
 			{
-				if (screenBuffer != null)
-					screenBuffer.Dispose();
+				screenBuffer?.Dispose();
 
 				// Render the screen into a frame buffer to simplify reading back screenshots
 				screenBuffer = Context.CreateFrameBuffer(surfaceBufferSize, Color.FromArgb(0xFF, 0, 0, 0));
@@ -195,8 +193,7 @@ namespace OpenRA
 			var worldBufferSize = worldViewport.Size.NextPowerOf2();
 			if (worldSprite == null || worldSprite.Sheet.Size != worldBufferSize)
 			{
-				if (worldBuffer != null)
-					worldBuffer.Dispose();
+				worldBuffer?.Dispose();
 
 				// Render the world into a framebuffer at 1:1 scaling to allow the depth buffer to match the artwork at all zoom levels
 				worldBuffer = Context.CreateFrameBuffer(worldBufferSize);
@@ -329,8 +326,7 @@ namespace OpenRA
 			{
 				if (currentBatchRenderer == value)
 					return;
-				if (currentBatchRenderer != null)
-					currentBatchRenderer.Flush();
+				currentBatchRenderer?.Flush();
 				currentBatchRenderer = value;
 			}
 		}
@@ -460,8 +456,7 @@ namespace OpenRA
 		{
 			WorldModelRenderer.Dispose();
 			tempBuffer.Dispose();
-			if (fontSheetBuilder != null)
-				fontSheetBuilder.Dispose();
+			fontSheetBuilder?.Dispose();
 			if (Fonts != null)
 				foreach (var font in Fonts.Values)
 					font.Dispose();

OpenRA.Game/Scripting/ScriptContext.cs

@@ -267,8 +267,7 @@ namespace OpenRA.Scripting
 				return;
 
 			disposed = true;
-			if (runtime != null)
-				runtime.Dispose();
+			runtime?.Dispose();
 		}
 
 		static IEnumerable<Type> ExtractRequiredTypes(Type t)

OpenRA.Game/Scripting/ScriptTypes.cs

@@ -168,8 +168,7 @@ namespace OpenRA.Scripting
 			{
 				// Object needs additional notification / context
 				var notify = obj as IScriptNotifyBind;
-				if (notify != null)
-					notify.OnScriptBind(context);
+				notify?.OnScriptBind(context);
 
 				return new LuaCustomClrObject(obj);
 			}

OpenRA.Game/Server/Server.cs

@@ -244,8 +244,7 @@ namespace OpenRA.Server
 						}
 
 						var conn = Conns.SingleOrDefault(c => c.Socket == s);
-						if (conn != null)
-							conn.ReadData(this);
+						conn?.ReadData(this);
 					}
 
 					delayedActions.PerformActions(0);

OpenRA.Game/Sound/Sound.cs

@@ -88,8 +88,7 @@ namespace OpenRA
 
 			if (sounds != null)
 				foreach (var soundSource in sounds.Values)
-					if (soundSource != null)
-						soundSource.Dispose();
+					soundSource?.Dispose();
 
 			this.loaders = loaders;
 			this.fileSystem = fileSystem;
@@ -430,8 +429,8 @@ namespace OpenRA
 			StopAudio();
 			if (sounds != null)
 				foreach (var soundSource in sounds.Values)
-					if (soundSource != null)
-						soundSource.Dispose();
+					soundSource?.Dispose();
+
 			soundEngine.Dispose();
 		}
 	}

OpenRA.Game/Widgets/Widget.cs

@@ -113,11 +113,9 @@ namespace OpenRA.Widgets
 
 			if (wasMouseOver != MouseOverWidget)
 			{
-				if (wasMouseOver != null)
-					wasMouseOver.MouseExited();
+				wasMouseOver?.MouseExited();
 
-				if (MouseOverWidget != null)
-					MouseOverWidget.MouseEntered();
+				MouseOverWidget?.MouseEntered();
 			}
 
 			return handled;

OpenRA.Game/Widgets/WidgetLoader.cs

@@ -50,8 +50,7 @@ namespace OpenRA
 
 			var widget = NewWidget(node.Key, args);
 
-			if (parent != null)
-				parent.AddChild(widget);
+			parent?.AddChild(widget);
 
 			if (node.Key.Contains("@"))
 				FieldLoader.LoadField(widget, "Id", node.Key.Split('@')[1]);

OpenRA.Game/World.cs

@@ -89,8 +89,7 @@ namespace OpenRA
 				{
 					renderPlayer = value;
 
-					if (RenderPlayerChanged != null)
-						RenderPlayerChanged(value);
+					RenderPlayerChanged?.Invoke(value);
 				}
 			}
 		}
@@ -159,8 +158,7 @@ namespace OpenRA
 			set
 			{
 				Sync.AssertUnsynced("The current order generator may not be changed from synced code");
-				if (orderGenerator != null)
-					orderGenerator.Deactivate();
+				orderGenerator?.Deactivate();
 
 				orderGenerator = value;
 			}
@@ -581,8 +579,7 @@ namespace OpenRA
 		{
 			Disposing = true;
 
-			if (OrderGenerator != null)
-				OrderGenerator.Deactivate();
+			OrderGenerator?.Deactivate();
 
 			frameEndActions.Clear();