From 99be883957b4f094bfe63587b224d6b02c040431 Mon Sep 17 00:00:00 2001
From: Sam Leung <slyh@hk-fun.com>
Date: Sun, 21 Jan 2024 00:53:46 +0000
Subject: [PATCH] Additional check for issue #72

---
 .../PatchedTrafficLightInitializationSystem.cs                 | 3 ++-
 TrafficLightsEnhancement/TrafficLightsEnhancement.csproj       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/TrafficLightsEnhancement/Systems/TrafficLightInitializationSystem/PatchedTrafficLightInitializationSystem.cs b/TrafficLightsEnhancement/Systems/TrafficLightInitializationSystem/PatchedTrafficLightInitializationSystem.cs
index b9ddb4d..ee42ba7 100644
--- a/TrafficLightsEnhancement/Systems/TrafficLightInitializationSystem/PatchedTrafficLightInitializationSystem.cs
+++ b/TrafficLightsEnhancement/Systems/TrafficLightInitializationSystem/PatchedTrafficLightInitializationSystem.cs
@@ -472,7 +472,8 @@ private void InitializeTrafficLights(DynamicBuffer<SubLane> subLanes, NativeList
                         // Temp fix for issue #72
                         // Maybe this function was called with deleted or temp SubLane
                         // And the game crashed when components were added to it
-                        if (extraLaneSignal.m_Flags != 0)
+                        // Not sure why checking if LaneSignal exists helps reduce crashes
+                        if (extraLaneSignal.m_Flags != 0 && m_LaneSignalData.HasComponent(subLane))
                         {
                             m_CommandBuffer.AddComponent(subLane, extraLaneSignal);
                         }
diff --git a/TrafficLightsEnhancement/TrafficLightsEnhancement.csproj b/TrafficLightsEnhancement/TrafficLightsEnhancement.csproj
index 386e603..e959053 100644
--- a/TrafficLightsEnhancement/TrafficLightsEnhancement.csproj
+++ b/TrafficLightsEnhancement/TrafficLightsEnhancement.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net46</TargetFramework>
     <AssemblyName>C2VM.TrafficLightsEnhancement</AssemblyName>
     <Description>C2VM.TrafficLightsEnhancement</Description>
-    <Version>0.2.13</Version>
+    <Version>0.2.14</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <RestoreAdditionalProjectSources>