Fix #7469: Desync when using build and refit feature.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 059f60837..eb7fc9654 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -31,6 +31,7 @@
 #include "ship.h"
 #include "newgrf.h"
 #include "company_base.h"
+#include "core/random_func.hpp"
 
 #include "table/strings.h"
 
@@ -131,6 +132,11 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 	DoCommandFlag subflags = flags;
 	if (refitting) subflags |= DC_EXEC;
 
+	/* Vehicle construction needs random bits, so we have to save the random
+	 * seeds to prevent desyncs. */
+	SavedRandomSeeds saved_seeds;
+	if (flags != subflags) SaveRandomSeeds(&saved_seeds);
+
 	Vehicle *v = NULL;
 	switch (type) {
 		case VEH_TRAIN:    value.AddCost(CmdBuildRailVehicle(tile, subflags, e, GB(p1, 24, 8), &v)); break;
@@ -179,6 +185,8 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 		}
 	}
 
+	if (flags != subflags) RestoreRandomSeeds(saved_seeds);
+
 	return value;
 }