fix build

zardoy · Dec 17, 2024 · e1701a3 · e1701a3
1 parent 5db677e
commit e1701a3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "dev-proxy": "node server.js",
     "start": "run-p dev-rsbuild dev-proxy watch-mesher watch-other-workers",
     "start2": "run-p dev-rsbuild watch-mesher watch-other-workers",
-    "build": "pnpm build-other-workers && rsbuild build",
+    "build": "rsbuild build && pnpm build-other-workers",
     "build-analyze": "BUNDLE_ANALYZE=true rsbuild build && pnpm build-other-workers",
     "check-build": "tsx scripts/genShims.ts && tsc && pnpm build",
     "test:cypress": "cypress run",

diff --git a/src/integratedServer/main.ts b/src/integratedServer/main.ts
@@ -64,7 +64,8 @@ export const startLocalServerMain = async (serverOptions: { version: any }) => {
 
   serverChannel.start({
     options: serverOptions,
-    mcData: await getMcDataForWorker(serverOptions.version)
+    mcData: await getMcDataForWorker(serverOptions.version),
+    settings: lastCustomSettings
   })
 
   await readyPromise

diff --git a/src/integratedServer/worker.ts b/src/integratedServer/worker.ts
@@ -111,7 +111,7 @@ const updateSettings = (initial = true) => {
 }
 
 export const workerProxyType = createWorkerProxy({
-  start ({ options, mcData, settings }) {
+  start ({ options, mcData, settings }: { options: any, mcData: any, settings: CustomAppSettings }) {
     globalSettings = settings
     //@ts-expect-error
     globalThis.mcData = mcData