Fix #59 setElementResource not getting sourceResource properly

Author: Fernando-A-Rocha

[examples]/test_vehicles/meta.xml

@@ -1,6 +1,8 @@
 <meta>
     <include resource="newmodels_azul" minversion="5.0.0"/>
     <script src="s_vehicles.lua" type="server"/>
+    <script src="s_vehicles_alt.lua" type="server"/>
+    <script src="s_test_cmd.lua" type="server"/>
     <aclrequest>
         <right name="function.loadstring" access="true"/>
     </aclrequest>

[examples]/test_vehicles/s_test_cmd.lua

@@ -0,0 +1,21 @@
+-- Outputs, for example:
+-- This vehicle has the custom model ID -1, which is based on the default model ID 490 (FBI Rancher)
+addCommandHandler("myvehicle", function(player)
+    local vehicle = getPedOccupiedVehicle(player)
+    if not vehicle then
+        outputChatBox("You are not in a vehicle", player, 255, 0, 0)
+        return
+    end
+    local serversideModel = getElementModel(vehicle)
+    local customModel = exports["newmodels_azul"]:getElementCustomModel(vehicle)
+    if not customModel then
+        outputChatBox("This vehicle has the default model ID " .. serversideModel .. " ("..(tostring(getVehicleNameFromModel(serversideModel)) or "")..")", player, 0, 255, 0)
+    else
+        local baseModel = exports["newmodels_azul"]:getElementBaseModel(vehicle)
+        if not baseModel then
+            outputChatBox("This vehicle has the custom model ID " .. customModel .. ", but the base model ID could not be determined", player, 255, 0, 0)
+            return
+        end
+        outputChatBox("This vehicle has the custom model ID " .. customModel .. ", which is based on the default model ID " .. baseModel .. " ("..(tostring(getVehicleNameFromModel(baseModel)) or "")..")", player, 0, 255, 0)
+    end
+end, false, false)

[examples]/test_vehicles/s_vehicles.lua

@@ -1,44 +1,22 @@
--- Loads newmodels functions, which allow usage of custom model IDs "as if they were normal IDs"
-loadstring(exports.newmodels_azul:import())()
+-- Method with exports
+--   These vehicles will be destroyed if newmodels_azul stops
+--   because they are children of that resource.
 
 -- Vehicle model, x,y,z, rx,ry,rz, interior,dimension
 local VEHICLE_SPAWNS = {
-    {525, -938.74, 1034.21, 23.59, 3.42, 2.85, 20.27, 0, 0},
     {490, -941.95, 1043.03, 24.25, 355.90, 356.51, 199.00, 0, 0},
-    {-1, -951.79, 1069.05, 25.96, 356.28, 356.34, 204.01, 0, 0},
-    {-5, -944.88, 1051.90, 24.84, 355.97, 356.23, 198.86, 0, 0},
+    {-1, -947.94, 1060.05, 25.96, 356.28, 356.34, 204.01, 0, 0},
 }
 
 local function createVehicles()
     for i, data in ipairs(VEHICLE_SPAWNS) do
         local model, x, y, z, rx, ry, rz, interior, dimension = unpack(data)
-        local vehicle = createVehicle(model, x, y, z, rx, ry, rz)
+        local vehicle = exports["newmodels_azul"]:createVehicle(model, x, y, z, rx, ry, rz)
         if vehicle then
             setElementInterior(vehicle, interior)
             setElementDimension(vehicle, dimension)
-            print("#" .. i .. " - Created vehicle with ID " .. model .. " at " .. x .. ", " .. y .. ", " .. z)
+            print("test_vehicles #" .. i .. " - Created vehicle with ID " .. model .. " at " .. x .. ", " .. y .. ", " .. z)
         end
     end
 end
 addEventHandler("onResourceStart", resourceRoot, createVehicles, false)
-
--- Outputs, for example:
--- This vehicle has the custom model ID -1, which is based on the default model ID 490 (FBI Rancher)
-addCommandHandler("myvehicle", function(player)
-    local vehicle = getPedOccupiedVehicle(player)
-    if not vehicle then
-        outputChatBox("You are not in a vehicle", player, 255, 0, 0)
-        return
-    end
-    local model = getElementModel(vehicle)
-    local baseModel = getElementBaseModel(vehicle)
-    if model == baseModel then
-        outputChatBox("This vehicle has the default model ID " .. model .. " ("..(tostring(getVehicleNameFromModel(model)) or "")..")", player, 0, 255, 0)
-    else
-        if not baseModel then
-            outputChatBox("This vehicle has the custom model ID " .. model .. ", but the base model ID could not be determined", player, 255, 0, 0)
-            return
-        end
-        outputChatBox("This vehicle has the custom model ID " .. model .. ", which is based on the default model ID " .. baseModel .. " ("..(tostring(getVehicleNameFromModel(baseModel)) or "")..")", player, 0, 255, 0)
-    end
-end, false, false)

[examples]/test_vehicles/s_vehicles_alt.lua

@@ -0,0 +1,25 @@
+-- Alternative method with loadstring
+--   These vehicles will not be destroyed if newmodels_azul stops
+--   because the elements are children of this resource on creation.
+
+-- Loads newmodels functions, which allow usage of custom model IDs "as if they were normal IDs"
+loadstring(exports.newmodels_azul:import())()
+
+-- Vehicle model, x,y,z, rx,ry,rz, interior,dimension
+local VEHICLE_SPAWNS = {
+    {525, -938.74, 1034.21, 23.59, 3.42, 2.85, 20.27, 0, 0},
+    {-5, -944.88, 1051.90, 24.84, 355.97, 356.23, 198.86, 0, 0},
+}
+
+local function createVehicles()
+    for i, data in ipairs(VEHICLE_SPAWNS) do
+        local model, x, y, z, rx, ry, rz, interior, dimension = unpack(data)
+        local vehicle = createVehicle(model, x, y, z, rx, ry, rz)
+        if vehicle then
+            setElementInterior(vehicle, interior)
+            setElementDimension(vehicle, dimension)
+            print("test_vehicles [alt] #" .. i .. " - Created vehicle with ID " .. model .. " at " .. x .. ", " .. y .. ", " .. z)
+        end
+    end
+end
+addEventHandler("onResourceStart", resourceRoot, createVehicles, false)

newmodels_azul/scripts/core/shared_exported.lua

@@ -139,6 +139,9 @@ function isDefaultID(elementType, id)
 end
 
 function isValidElement(element)
+    if not element or not isElement(element) then
+        return false
+    end
     local elementType = getElementType(element)
     for _, elementType2 in pairs(VALID_ELEMENT_TYPES) do
         if elementType == elementType2 then
@@ -151,17 +154,16 @@ function getValidElementTypes()
     return VALID_ELEMENT_TYPES
 end
 
+-- In MTA Elements are always destroyed when the resource that created them is stopped: this cannot be changed.
+-- So we use an internal table to keep track of elements created by resources.
 newmodelsUtils.setElementResource = function(element, theResource)
     if isElement(element) then
-        if not isElement(theResource) then theResource = resource end
+        -- if not isElement(theResource) then theResource = resource end
+        if (not theResource) or (not isElement(getResourceRootElement(theResource))) then theResource = resource end
         if type(newmodelsUtils.resources[theResource]) ~= "table" then
             newmodelsUtils.resources[theResource] = {}
         end
         table.insert(newmodelsUtils.resources[theResource], element)
-        local dynRoot = getResourceDynamicElementRoot(theResource)
-        if dynRoot then
-            setElementParent(element, dynRoot)
-        end
     end
 end