diff --git a/src/client/appearance/getters.ts b/src/client/appearance/getters.ts index 8432a3e..552f514 100644 --- a/src/client/appearance/getters.ts +++ b/src/client/appearance/getters.ts @@ -67,14 +67,12 @@ export function getHeadOverlay(pedHandle: number) { if (overlay === "EyeColor") { headData[overlay] = { - id: overlay, index: i, overlayValue: GetPedEyeColor(pedHandle) }; } else { const [_, overlayValue, colourType, firstColor, secondColor, overlayOpacity] = GetPedHeadOverlayData(pedHandle, i); headData[overlay] = { - id: overlay, index: i, overlayValue: overlayValue === 255 ? -1 : overlayValue, colourType: colourType, diff --git a/src/server/appearance/setters.ts b/src/server/appearance/setters.ts index 7477a08..cebc0bd 100644 --- a/src/server/appearance/setters.ts +++ b/src/server/appearance/setters.ts @@ -53,18 +53,8 @@ exports('SavePlayerTattoos', function(id, tattoos) { export async function saveAppearance(src: number, frameworkId: string, appearance: TAppearance, force?: boolean) { - if (src && frameworkId) { - const playerId = getFrameworkID(src); - - if (!force && frameworkId !== playerId) { - console.warn('You are trying to save an appearance for a different player', src, frameworkId); - return; - } - } - - if (!frameworkId) { - frameworkId = getFrameworkID(src); - } + if (!force && src && frameworkId && getFrameworkID(src) !== frameworkId) console.warn('You are trying to save an appearance for a different player', src, frameworkId); + if (!frameworkId) frameworkId = getFrameworkID(src); const clothes = { drawables: appearance.drawables, diff --git a/src/typings/appearance.ts b/src/typings/appearance.ts index 6162332..c7eda7c 100644 --- a/src/typings/appearance.ts +++ b/src/typings/appearance.ts @@ -21,7 +21,6 @@ interface THairData { // interface for head overlay data interface HeadOverlayData { - id: string; index: number; overlayValue?: number; colourinterface?: number; diff --git a/web/src/components/menu/Face.svelte b/web/src/components/menu/Face.svelte index 1ad7f37..05093c5 100644 --- a/web/src/components/menu/Face.svelte +++ b/web/src/components/menu/Face.svelte @@ -4,7 +4,7 @@ import Slider from '@components/micro/Slider.svelte'; import Wrapper from '@components/micro/Wrapper.svelte'; import { APPEARANCE, LOCALE } from '@stores/appearance'; - import type { TValue, THeadOverlay, TEyeColor } from '@typings/apperance'; + import type { TValue, THeadOverlay } from '@typings/apperance'; $: data = $APPEARANCE.headStructure; let eyeColor = ($APPEARANCE.headOverlay?.EyeColor as TValue) || null;