From 3ec3eac160ab64a95817c4426589e3b86a50d2ed Mon Sep 17 00:00:00 2001
From: Mustafa Alperen Seki <mustafaoyunda37@gmail.com>
Date: Tue, 25 Aug 2020 13:44:11 +0300
Subject: [PATCH] Don't StartOnThreshold if the trait is disabled.

---
 OpenRA.Mods.Common/Traits/DamagedByTerrain.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Traits/DamagedByTerrain.cs b/OpenRA.Mods.Common/Traits/DamagedByTerrain.cs
index fd15f2444a..b260f00b95 100644
--- a/OpenRA.Mods.Common/Traits/DamagedByTerrain.cs
+++ b/OpenRA.Mods.Common/Traits/DamagedByTerrain.cs
@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		void INotifyAddedToWorld.AddedToWorld(Actor self)
 		{
-			if (!Info.StartOnThreshold)
+			if (!Info.StartOnThreshold || IsTraitDisabled)
 				return;
 
 			var safeTiles = 0;