From d56c785a37fd858af5d5ba997e07137316cb2afe Mon Sep 17 00:00:00 2001
From: Scully <51968381+Scullyy@users.noreply.github.com>
Date: Tue, 28 Jan 2025 12:00:58 -0800
Subject: [PATCH] fix(vehicleProps): split modLivery from livery (#699)

---
 resource/vehicleProperties/client.lua | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/resource/vehicleProperties/client.lua b/resource/vehicleProperties/client.lua
index 9e15060..d898130 100644
--- a/resource/vehicleProperties/client.lua
+++ b/resource/vehicleProperties/client.lua
@@ -80,6 +80,7 @@ if cache.game == 'redm' then return end
 ---@field modLivery? number
 ---@field modRoofLivery? number
 ---@field modLightbar? number
+---@field livery? number
 ---@field windows? number[]
 ---@field doors? number[]
 ---@field tyres? table<number | string, 1 | 2>
@@ -151,13 +152,6 @@ function lib.getVehicleProperties(vehicle)
             end
         end
 
-        local modLiveryCount = GetVehicleLiveryCount(vehicle)
-        local modLivery = GetVehicleLivery(vehicle)
-
-        if modLiveryCount == -1 or modLivery == -1 then
-            modLivery = GetVehicleMod(vehicle, 48)
-        end
-
         local damage = {
             windows = {},
             doors = {},
@@ -273,9 +267,10 @@ function lib.getVehicleProperties(vehicle)
             modTank = GetVehicleMod(vehicle, 45),
             modWindows = GetVehicleMod(vehicle, 46),
             modDoorR = GetVehicleMod(vehicle, 47),
-            modLivery = modLivery,
+            modLivery = GetVehicleMod(vehicle, 48),
             modRoofLivery = GetVehicleRoofLivery(vehicle),
             modLightbar = GetVehicleMod(vehicle, 49),
+            livery = GetVehicleLivery(vehicle),
             windows = damage.windows,
             doors = damage.doors,
             tyres = damage.tyres,
@@ -623,7 +618,6 @@ function lib.setVehicleProperties(vehicle, props, fixVehicle)
 
     if props.modLivery then
         SetVehicleMod(vehicle, 48, props.modLivery, false)
-        SetVehicleLivery(vehicle, props.modLivery)
     end
 
     if props.modRoofLivery then
@@ -634,6 +628,10 @@ function lib.setVehicleProperties(vehicle, props, fixVehicle)
         SetVehicleMod(vehicle, 49, props.modLightbar, false)
     end
 
+    if props.livery then
+        SetVehicleLivery(vehicle, props.livery)
+    end
+
     if props.bulletProofTyres ~= nil then
         SetVehicleTyresCanBurst(vehicle, props.bulletProofTyres)
     end