From 843dce94a482754cb7ab276a138cf5d03c8b87f3 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Thu, 18 Mar 2021 10:37:07 +0000
Subject: [PATCH] Fix mispredicted stop location when through-loading

When using realistic braking and skipped train parts have different
lengths.
---
 src/train_cmd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 07cf3a2dcc..4d165dfab8 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -672,8 +672,8 @@ int PredictStationStoppingLocation(const Train *v, const Order *order, int stati
 				}
 				if (skip) {
 					for (const Train *part = u; part != nullptr; part = part->HasArticulatedPart() ? part->GetNextArticulatedPart() : nullptr) {
-						overhang -= u->gcache.cached_veh_length;
-						adjust += u->gcache.cached_veh_length;
+						overhang -= part->gcache.cached_veh_length;
+						adjust += part->gcache.cached_veh_length;
 					}
 					continue;
 				}