From 4e9e6233ff96e3de0921fc3d40cb68e4edcd1d4a Mon Sep 17 00:00:00 2001
From: wad <77159113+wad4444@users.noreply.github.com>
Date: Sat, 16 Aug 2025 04:12:36 +0300
Subject: [PATCH] fix: apply `gameId` and `placeId` only after initial sync
 (#1104)

---
 CHANGELOG.md                | 2 ++
 plugin/src/ServeSession.lua | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f09a084f..eb44c444 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * Fixed `Auto Connect Playtest Server` no longer functioning due to Roblox change ([#1066])
 * Added an update indicator to the version header when a new version of the plugin is available. ([#1069])
 * Added `--absolute` flag to the sourcemap subcommand, which will emit absolute paths instead of relative paths. ([#1092])
+* Fixed applying `gameId` and `placeId` before initial sync was accepted ([#1104])
 
 [#1093]: https://github.com/rojo-rbx/rojo/pull/1093
 [#1084]: https://github.com/rojo-rbx/rojo/pull/1084
@@ -18,6 +19,7 @@
 [#1049]: https://github.com/rojo-rbx/rojo/pull/1066
 [#1069]: https://github.com/rojo-rbx/rojo/pull/1069
 [#1092]: https://github.com/rojo-rbx/rojo/pull/1092
+[#1104]: https://github.com/rojo-rbx/rojo/pull/1104
 
 ## 7.5.1 - April 25th, 2025
 * Fixed output spam related to `Instance.Capabilities` in the plugin
diff --git a/plugin/src/ServeSession.lua b/plugin/src/ServeSession.lua
index bb844d06..62a5c76a 100644
--- a/plugin/src/ServeSession.lua
+++ b/plugin/src/ServeSession.lua
@@ -139,10 +139,9 @@ function ServeSession:start()
 	self.__apiContext
 		:connect()
 		:andThen(function(serverInfo)
-			self:__applyGameAndPlaceId(serverInfo)
-
 			return self:__initialSync(serverInfo):andThen(function()
 				self:__setStatus(Status.Connected, serverInfo.projectName)
+				self:__applyGameAndPlaceId(serverInfo)
 
 				return self:__mainSyncLoop()
 			end)