From a24d57d167adb74f3a96e3dd2bbf8947ee9844d2 Mon Sep 17 00:00:00 2001 From: Linden Date: Thu, 24 Jun 2021 10:49:32 +1000 Subject: [PATCH 1/3] Revert "fix(client/functions): Properly network SpawnVehicle/SpawnObject entities" This reverts commit c3acd5fd2ae0e09eaf2c96cde7a7882355a7b101. --- client/functions.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/functions.lua b/client/functions.lua index a69613ea..7bc1d3b7 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -335,10 +335,11 @@ ESX.Game.Teleport = function(entity, coords, cb) end end -ESX.Game.SpawnObject = function(object, coords, cb, networked) +ESX.Game.SpawnObject = function(object, coords, cb, networked, dynamic) local model = (type(object) == 'number' and model or GetHashKey(object)) local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z) - networked = networked or true + networked = networked == nil and true or false + dynamic = dynamic ~= nil and true or false Citizen.CreateThread(function() ESX.Streaming.RequestModel(model) @@ -346,7 +347,7 @@ ESX.Game.SpawnObject = function(object, coords, cb, networked) -- The below has to be done just for CreateObject since for some reason CreateObjects model argument is set -- as an Object instead of a hash so it doesn't automatically hash the item model = type(model) == 'number' and model or GetHashKey(model) - local obj = CreateObject(model, vector.xyz, networked, false, true) + local obj = CreateObject(model, vector.xyz, networked, false, dynamic) if cb then cb(obj) end @@ -371,7 +372,7 @@ end ESX.Game.SpawnVehicle = function(vehicle, coords, heading, cb, networked) local model = (type(vehicle) == 'number' and vehicle or GetHashKey(vehicle)) local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z) - networked = networked or true + networked = networked == nil and true or false Citizen.CreateThread(function() ESX.Streaming.RequestModel(model) From 29dc11b91a37d392bd08b8ed93f6cfefdf766ead Mon Sep 17 00:00:00 2001 From: Linden Date: Thu, 24 Jun 2021 10:51:42 +1000 Subject: [PATCH 2/3] fix(client/main): Respect the networked value if sent for SpawnObject/SpawnVehicle --- client/functions.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/client/functions.lua b/client/functions.lua index 7bc1d3b7..8326b588 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -335,11 +335,10 @@ ESX.Game.Teleport = function(entity, coords, cb) end end -ESX.Game.SpawnObject = function(object, coords, cb, networked, dynamic) +ESX.Game.SpawnObject = function(object, coords, cb, networked) local model = (type(object) == 'number' and model or GetHashKey(object)) local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z) - networked = networked == nil and true or false - dynamic = dynamic ~= nil and true or false + networked = networked == nil and true or networked Citizen.CreateThread(function() ESX.Streaming.RequestModel(model) @@ -347,7 +346,7 @@ ESX.Game.SpawnObject = function(object, coords, cb, networked, dynamic) -- The below has to be done just for CreateObject since for some reason CreateObjects model argument is set -- as an Object instead of a hash so it doesn't automatically hash the item model = type(model) == 'number' and model or GetHashKey(model) - local obj = CreateObject(model, vector.xyz, networked, false, dynamic) + local obj = CreateObject(model, vector.xyz, networked, false, true) if cb then cb(obj) end @@ -372,7 +371,7 @@ end ESX.Game.SpawnVehicle = function(vehicle, coords, heading, cb, networked) local model = (type(vehicle) == 'number' and vehicle or GetHashKey(vehicle)) local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z) - networked = networked == nil and true or false + networked = networked == nil and true or networked Citizen.CreateThread(function() ESX.Streaming.RequestModel(model) From 2c7215f5b9a9c4e5a36e555562825edc779f43d3 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Thu, 24 Jun 2021 10:57:47 +1000 Subject: [PATCH 3/3] Update version.json --- version.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.json b/version.json index f5d38d40..cfa280f7 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { "version": "legacy", - "commit" : "1.3.3", - "changelog": "\n- Resolved an issue when using Config.Identity\n- MySQL.store is now storing entire queries ahead of time\n- Improved support when using esx_multicharacter" + "commit" : "1.3.4", + "changelog": "\n- Corrected spawning of entities" }