fix: The authlib-injector config is not respected

Voxelum · Feb 20, 2024 · 1a60f2d · 1a60f2d
1 parent 7f754f1
commit 1a60f2d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/xmcl-keystone-ui/src/composables/instanceLaunch.ts b/xmcl-keystone-ui/src/composables/instanceLaunch.ts
@@ -10,7 +10,7 @@ export const kInstanceLaunch: InjectionKey<ReturnType<typeof useInstanceLaunch>>
 export function useInstanceLaunch(instance: Ref<Instance>, resolvedVersion: Ref<ResolvedVersion | { requirements: Record<string, any> } | undefined>, java: Ref<JavaRecord | undefined>, userProfile: Ref<UserProfile>, globalState: ReturnType<typeof useSettingsState>) {
   const { refreshUser } = useService(UserServiceKey)
   const { launch, kill, on, getGameProcesses, reportOperation } = useService(LaunchServiceKey)
-  const { globalAssignMemory, globalMaxMemory, globalMinMemory, globalMcOptions, globalVmOptions, globalFastLaunch, globalHideLauncher, globalShowLog } = useGlobalSettings(globalState)
+  const { globalAssignMemory, globalMaxMemory, globalMinMemory, globalMcOptions, globalVmOptions, globalFastLaunch, globalHideLauncher, globalShowLog, globalDisableAuthlibInjector } = useGlobalSettings(globalState)
   const { getMemoryStatus } = useService(BaseServiceKey)
   const { abortRefresh } = useService(UserServiceKey)
   const { getOrInstallAuthlibInjector, abortAuthlibInjectorInstall } = useService(AuthlibInjectorServiceKey)
@@ -100,15 +100,18 @@ export function useInstanceLaunch(instance: Ref<Instance>, resolvedVersion: Ref<
     let yggdrasilAgent: LaunchOptions['yggdrasilAgent']
 
     const authority = tryParseUrl(userProfile.value.authority)
-    if (authority && (authority.protocol === 'http:' || authority?.protocol === 'https:' || userProfile.value.authority === AUTHORITY_DEV)) {
+
+    const inst = instance.value
+
+    const disableAuthlibInjector = inst.disableAuthlibInjector ?? globalDisableAuthlibInjector.value
+    if (!disableAuthlibInjector && authority && (authority.protocol === 'http:' || authority?.protocol === 'https:' || userProfile.value.authority === AUTHORITY_DEV)) {
       launchingStatus.value = 'preparing-authlib'
       yggdrasilAgent = {
         jar: await track(getOrInstallAuthlibInjector(), 'prepare-authlib', id),
         server: userProfile.value.authority,
       }
     }
 
-    const inst = instance.value
     const assignMemory = inst.assignMemory ?? globalAssignMemory.value
     const hideLauncher = inst.hideLauncher ?? globalHideLauncher.value
     const showLog = inst.showLog ?? globalShowLog.value