From 325d0f5a966ad33831e79d83e6cf197ed5ac051d Mon Sep 17 00:00:00 2001
From: Fernando-A-Rocha <frocha2001@gmail.com>
Date: Sat, 6 Jul 2024 14:18:42 +0100
Subject: [PATCH] Update client.lua

---
 newmodels_reborn/core/client.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/newmodels_reborn/core/client.lua b/newmodels_reborn/core/client.lua
index b1adcc8..796b169 100644
--- a/newmodels_reborn/core/client.lua
+++ b/newmodels_reborn/core/client.lua
@@ -8,10 +8,11 @@ local function applyElementCustomModel(element)
     local loadedModel = loadedModels[customModel]
     if not loadedModel then return end
 
-    local upgrades, handling
+    local upgrades, handling, paintjob
     if getElementType(element) == "vehicle" then
         upgrades = getVehicleUpgrades(element)
         handling = getVehicleHandling(element)
+        paintjob = getVehiclePaintjob(element)
     end
 
     _setElementModel(element, loadedModel.id) 
@@ -26,6 +27,9 @@ local function applyElementCustomModel(element)
             setVehicleHandling(element, k, v)
         end
     end
+    if paintjob then
+        setVehiclePaintjob(element, paintjob)
+    end
 end
 
 local function loadCustomModel(customModel, elementToApply)
@@ -89,7 +93,7 @@ end
 
 local function countStreamedElementsWithCustomModel(elementTypes, customModel)
     local count = 0
-    for k, elementType in pairs(elementTypes) do
+    for _, elementType in pairs(elementTypes) do
         for _, v in pairs(getElementsByType(elementType, root, true)) do
             if getElementData(v, CUSTOM_MODEL_DATA_KEY) == customModel then
                 count = count + 1
@@ -181,16 +185,12 @@ addEventHandler("onClientElementDestroy", root, function()
     freeAllocatedModelIfUnused(customModel)
 end)
 
-local function applyCustomModelsForStreamedElements()
+addEventHandler("newmodels_reborn:receiveCustomModels", resourceRoot, function(customModelsFromServer)
+    customModels = customModelsFromServer
+
     for _, elementType in pairs(ELEMENT_TYPES) do
         for _, v in pairs(getElementsByType(elementType, root, true)) do
             setElementCustomModel(v)
         end
     end
-end
-
-addEventHandler("newmodels_reborn:receiveCustomModels", resourceRoot, function(customModelsFromServer)
-    customModels = customModelsFromServer
-
-    applyCustomModelsForStreamedElements()
 end, false)