From addfdf50fa27e9ffd9700327e38bbd04b5160710 Mon Sep 17 00:00:00 2001
From: Gustas <37534529+Punsho@users.noreply.github.com>
Date: Sat, 29 Jan 2022 12:39:51 +0200
Subject: [PATCH] Crash when EditorWorld does not have BuildableTerrainOverlay

---
 .../Widgets/Logic/Editor/MapEditorLogic.cs        | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs
index c76986bf09..2165988fef 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorLogic.cs
@@ -144,17 +144,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 				if (cat.HasFlag(MapOverlays.Buildable))
 				{
-					var buildableTerrainTrait = world.WorldActor.TraitOrDefault<BuildableTerrainOverlay>();
-					if (buildableTerrainTrait != null)
+					var buildableTerrainTrait = world.WorldActor.Trait<BuildableTerrainOverlay>();
+					category.OnClick = () =>
 					{
-						category.OnClick = () =>
-						{
-							overlays ^= cat;
-							buildableTerrainTrait.Enabled = overlays.HasFlag(MapOverlays.Buildable);
-						};
-					}
-					else
-						continue;
+						overlays ^= cat;
+						buildableTerrainTrait.Enabled = overlays.HasFlag(MapOverlays.Buildable);
+					};
 				}
 
 				categoriesPanel.AddChild(category);