Merge branch 'main' into mastermind

Byte-Labs-Studio · Aug 12, 2024 · b263a35 · b263a35
2 parents ce1c406 + 18cd882
commit b263a35
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -64,7 +64,7 @@ jobs:
  mkdir -p ./temp/bl_appearance
  mkdir -p ./temp/bl_appearance/dist/
  mkdir -p ./temp/bl_appearance/build/
- cp ./{LICENSE,README.md,fxmanifest.lua,appearance.sql,Installation.md} ./temp/bl_appearance
+ cp ./{LICENSE,README.md,fxmanifest.lua,appearance.sql} ./temp/bl_appearance
  cp -r ./{data,locale} ./temp/bl_appearance
  cp -r ./build/* ./temp/bl_appearance/build/
  cp -r ./dist/* ./temp/bl_appearance/dist/

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -4,7 +4,7 @@ game "gta5"
 lua54 'yes'
 
 author "Byte Labs"
-version '1.1.0'
+version '1.1.1'
 description 'Customize your virtual persona with precision using the Byte Labs Appearance Menu'
 repository 'https://github.com/Byte-Labs-Studio/bl_appearance'
 

diff --git a/src/server/appearance/setters.ts b/src/server/appearance/setters.ts
@@ -52,11 +52,11 @@ exports('SavePlayerTattoos', function(id, tattoos) {
 });
 
 
-export async function saveAppearance(src: number, frameworkId: string, appearance: TAppearance) {
+export async function saveAppearance(src: number, frameworkId: string, appearance: TAppearance, force?: boolean) {
  if (src && frameworkId) {
  const playerId = getFrameworkID(src);
 
- if (frameworkId !== playerId) {
+ if (!force && frameworkId !== playerId) {
  console.warn('You are trying to save an appearance for a different player', src, frameworkId);
  return;
  }

diff --git a/src/server/migrate/fivem.ts b/src/server/migrate/fivem.ts
@@ -18,7 +18,7 @@ const migrate = async (src: string) => {
  await delay(100);
  const response = await triggerClientCallback('bl_appearance:client:getAppearance', src) as TAppearance
  const playerSrc = parseInt(src)
- await saveAppearance(playerSrc, element.citizenid, response as TAppearance)
+ await saveAppearance(playerSrc, element.citizenid, response as TAppearance, true)
  }
  }
  console.log('Converted '+ response.length + ' appearances')

diff --git a/src/server/migrate/illenium.ts b/src/server/migrate/illenium.ts
@@ -18,7 +18,7 @@ const migrate = async (src: string) => {
  await delay(100);
  const response = await triggerClientCallback('bl_appearance:client:getAppearance', src) as TAppearance
  const playerSrc = parseInt(src)
- await saveAppearance(playerSrc, element.citizenid, response as TAppearance)
+ await saveAppearance(playerSrc, element.citizenid, response as TAppearance, true)
  }
  }
  console.log('Converted '+ response.length + ' appearances')

diff --git a/src/server/migrate/qb.ts b/src/server/migrate/qb.ts
@@ -14,7 +14,7 @@ const migrate = async (src: string) => {
  await delay(200);
  const response = await triggerClientCallback('bl_appearance:client:getAppearance', src) as TAppearance
  const playerSrc = parseInt(src)
- await saveAppearance(playerSrc, element.citizenid, response as TAppearance)
+ await saveAppearance(playerSrc, element.citizenid, response as TAppearance, true)
  }
  console.log('Converted '+ response.length + ' appearances')
 };