Fix NRE. Improve support for evac buses

bloodypenguin · May 23, 2017 · 83250b6 · 83250b6
1 parent 06c5247
commit 83250b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Detour/BusAIDetour.cs b/Detour/BusAIDetour.cs
@@ -31,8 +31,9 @@ public override bool CanLeave(ushort vehicleID, ref Vehicle vehicleData)
             {
                 //begin mod(+): Check if unbunching enabled for this line & stop. track if unbunching happens. Don't divide m_waitCounter by 2^4
                 ushort currentStop = VehicleManagerMod.m_cachedVehicleData[vehicleID].CurrentStop;
-                if (currentStop != 0 && NetManagerMod.m_cachedNodeData[currentStop].Unbunching &&
-                    TransportLineMod.GetUnbunchingState(vehicleData.m_transportLine))
+                if (currentStop != 0 && (NetManagerMod.m_cachedNodeData[currentStop].Unbunching &&
+                                         TransportLineMod.GetUnbunchingState(vehicleData.m_transportLine) ||
+                                         vehicleData.Info?.m_class?.m_service == ItemClass.Service.Disaster))
                 {
                     var canLeaveStop = Singleton<TransportManager>.instance.m_lines
                         .m_buffer[(int)vehicleData.m_transportLine]

diff --git a/Detour/TransportLineMod.cs b/Detour/TransportLineMod.cs
@@ -583,7 +583,7 @@ public static int CountLineActiveVehicles(ushort lineID, Action<Int32> callback
                               Vehicle.Flags.InsideBuilding | Vehicle.Flags.LeftHandDrive))
                         {
                             //begin mod(+): callback
-                            callback.Invoke(num3);
+                            callback?.Invoke(num3);
                             //end mod
                             ++num2;
                         }

diff --git a/LineWatcher.cs b/LineWatcher.cs
@@ -55,7 +55,7 @@ private void Update()
             ushort closestDepot = TransportLineMod.GetClosestDepot(lineID, position);
             if ((int) closestDepot != 0)
               TransportLineMod.SetDepot(lineID, closestDepot);
-            if (OptionsWrapper<Settings>.Options.ShowLineInfo)
+            if (OptionsWrapper<Settings>.Options.ShowLineInfo && lines.m_buffer[(int)lineID].Info?.m_class?.m_service != ItemClass.Service.Disaster)
               WorldInfoPanel.Show<PublicTransportWorldInfoPanel>(position, new InstanceID()
               {
                 TransportLine = lineID