From aa1055652252f5a3ab70768c1b2c7a3b8e7dc70b Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Tue, 11 Jun 2019 01:59:17 +0100
Subject: [PATCH] TBTR: Avoid articulated/rear units being added to tile hash

(cherry picked from commit 5a2e4981824cf30f13dde50a4a518a71d00ad000)
---
 src/articulated_vehicles.cpp | 2 ++
 src/train_cmd.cpp            | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp
index 44ad587895..a46ac7f7af 100644
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -394,6 +394,8 @@ void AddArticulatedParts(Vehicle *first)
 				}
 				t->refit_cap = 0;
 
+				if (front->IsVirtual()) t->SetVirtual();
+
 				t->SetArticulatedPart();
 				break;
 			}
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 4e3aae1d07..762b268554 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -722,6 +722,7 @@ static void AddRearEngineToMultiheadedTrain(Train *v)
 	u->random_bits = VehicleRandomBits();
 	v->SetMultiheaded();
 	u->SetMultiheaded();
+	if (v->IsVirtual()) u->SetVirtual();
 	v->SetNext(u);
 	u->UpdatePosition();
 
@@ -4121,6 +4122,7 @@ Train* CmdBuildVirtualRailWagon(const Engine *e)
 
 	v->SetWagon();
 	v->SetFreeWagon();
+	v->SetVirtual();
 
 	v->cargo_type = e->GetDefaultCargoType();
 	v->cargo_cap = rvi->capacity;
@@ -4204,6 +4206,7 @@ Train* CmdBuildVirtualRailVehicle(EngineID eid, StringID &error)
 
 	v->SetFrontEngine();
 	v->SetEngine();
+	v->SetVirtual();
 
 	if (rvi->railveh_type == RAILVEH_MULTIHEAD) {
 		AddRearEngineToMultiheadedTrain(v);