From dbe7c2a89f211f79d49f97dbd3111e530d398d38 Mon Sep 17 00:00:00 2001
From: doterop <daniel.oterop@gmail.com>
Date: Wed, 14 Oct 2020 16:27:43 +0200
Subject: [PATCH] Fixed tick activation

---
 .../Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp
index 713d9c89e..661a3b5a6 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/CarlaGameModeBase.cpp
@@ -376,6 +376,7 @@ void ACarlaGameModeBase::RegisterEnvironmentObject()
     EnvironmentObject.Id = CityHash64(ActorNameChar, ActorName.Len());
     EnvironmentObject.Name = ActorName;
     EnvironmentObject.Actor = Actor;
+    EnvironmentObject.CanTick = Actor->IsActorTickEnabled();
 
     EnvironmentObjects.Emplace(EnvironmentObject);
   }
@@ -394,7 +395,10 @@ void ACarlaGameModeBase::EnableEnvironmentObjects(
 
       Actor->SetActorHiddenInGame(!Enable);
       Actor->SetActorEnableCollision(Enable);
-      Actor->SetActorTickEnabled(Enable);
+      if(EnvironmentObject.CanTick)
+      {
+        Actor->SetActorTickEnabled(Enable);
+      }
     }
   }