From a426e6b0797171150faa861bca194d84798d9ce6 Mon Sep 17 00:00:00 2001 From: Nexius Date: Mon, 10 Nov 2025 21:30:05 +0300 Subject: [PATCH 1/2] There are also trams when we check train locos --- Server/Components/Vehicles/vehicle.cpp | 2 +- Server/Components/Vehicles/vehicles_impl.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/Components/Vehicles/vehicle.cpp b/Server/Components/Vehicles/vehicle.cpp index c1a48f54b..be6ab215c 100644 --- a/Server/Components/Vehicles/vehicle.cpp +++ b/Server/Components/Vehicles/vehicle.cpp @@ -41,7 +41,7 @@ void Vehicle::streamInForPlayer(IPlayer& player) streamIn.Angle = rot.ToEuler().z; // Trains should always be streamed with default rotation. - if (spawnData.modelID == 537 || spawnData.modelID == 538) + if (spawnData.modelID == 537 || spawnData.modelID == 538 || spawnData.modelID == 449) { streamIn.Angle = spawnData.zRotation; } diff --git a/Server/Components/Vehicles/vehicles_impl.hpp b/Server/Components/Vehicles/vehicles_impl.hpp index 3d333b664..027dbf450 100644 --- a/Server/Components/Vehicles/vehicles_impl.hpp +++ b/Server/Components/Vehicles/vehicles_impl.hpp @@ -547,7 +547,7 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl // Trains shouldn't be respawned. const int model = vehicle->getModel(); - if (model == 537 || model == 538 || model == 569 || model == 570) + if (model == 537 || model == 538 || model == 570 || model == 569 || model == 449) { continue; } From 66184e4ad8894a728783f915b31aabff23942045 Mon Sep 17 00:00:00 2001 From: Nexius Date: Tue, 11 Nov 2025 10:46:52 +0300 Subject: [PATCH 2/2] Add one more place to consider tram as train loco --- Server/Components/Vehicles/vehicles_impl.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/Components/Vehicles/vehicles_impl.hpp b/Server/Components/Vehicles/vehicles_impl.hpp index 027dbf450..10ed1e22b 100644 --- a/Server/Components/Vehicles/vehicles_impl.hpp +++ b/Server/Components/Vehicles/vehicles_impl.hpp @@ -390,7 +390,7 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl { return nullptr; } - if (!isStatic && (modelID == 538 || modelID == 537)) + if (!isStatic && (modelID == 538 || modelID == 537 || modelID == 449)) { return nullptr; }