Merge pull request #1108 from CitiesSkylinesMods/11.5.2-to-master

11.5.2 to master
CitiesSkylinesMods · May 16, 2021 · ee82496 · ee82496
2 parents 83f61e0 + 09d6b55
commit ee82496
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/TLM/TLM/Custom/PathFinding/CustomPathFind.cs b/TLM/TLM/Custom/PathFinding/CustomPathFind.cs
@@ -837,7 +837,7 @@ private void PathFindImplementation(uint unit, ref PathUnit data) {
                             PathUnits.m_buffer[currentPathUnitId].m_laneTypes =
                                 (byte)finalBufferItem.LanesUsed;
                             PathUnits.m_buffer[currentPathUnitId].m_vehicleTypes =
-                                (ushort)finalBufferItem.VehiclesUsed;
+                                (uint)finalBufferItem.VehiclesUsed;
 
                             sumOfPositionCounts += currentItemPositionCount;
                             Singleton<PathManager>.instance.m_pathUnitCount =
@@ -1567,7 +1567,8 @@ and we are at the start segment */
                 }
 
                 ushort nextSegmentId;
-                if ((vehicleTypes_ & VehicleInfo.VehicleType.Ferry) != VehicleInfo.VehicleType.None) {
+                if ((queueItem_.vehicleType & (ExtVehicleType.CargoVehicle | ExtVehicleType.Service)) == ExtVehicleType.None &&
+                    (vehicleTypes_ & VehicleInfo.VehicleType.Ferry) != VehicleInfo.VehicleType.None) {
                     // ferry (/ monorail)
                     if (isLogEnabled) {
                         DebugLog(