Skip to content

Fix: Player spawns properly #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DispersiaRoleplay wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix: Player spawns properly #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f15265
Create ua.lua
DispersiaRoleplay Apr 7, 2025
2b521ab
Merge pull request #1 from DispersiaRoleplay/DispersiaRoleplay-patch-1
DispersiaRoleplay Apr 7, 2025
5b376b4
Fix: Player spawns properly
DispersiaRoleplay May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,24 +172,25 @@ RegisterNUICallback('spawnplayer', function(data, cb)
local insideMeta = PlayerData.metadata['inside']
if type == 'current' then
PreSpawnPlayer()

QBCore.Functions.GetPlayerData(function(pd)
ped = PlayerPedId()
SetEntityCoords(ped, pd.position.x, pd.position.y, pd.position.z)
SetEntityHeading(ped, pd.position.a)
FreezeEntityPosition(ped, false)
end)

if insideMeta.house ~= nil then
local houseId = insideMeta.house
TriggerEvent('qb-houses:client:LastLocationHouse', houseId)
elseif insideMeta.apartment.apartmentType ~= nil or insideMeta.apartment.apartmentId ~= nil then
local apartmentType = insideMeta.apartment.apartmentType
local apartmentId = insideMeta.apartment.apartmentId
TriggerEvent('qb-apartments:client:LastLocationHouse', apartmentType, apartmentId)
end
TriggerServerEvent('QBCore:Server:OnPlayerLoaded')
TriggerEvent('QBCore:Client:OnPlayerLoaded')
PostSpawnPlayer()

local insideMeta = pd.metadata and pd.metadata['inside'] or {}

if insideMeta.house then
TriggerEvent('qb-houses:client:LastLocationHouse', insideMeta.house)
elseif insideMeta.apartment and insideMeta.apartment.apartmentType and insideMeta.apartment.apartmentId then
TriggerEvent('qb-apartments:client:LastLocationHouse', insideMeta.apartment.apartmentType, insideMeta.apartment.apartmentId)
end

TriggerServerEvent('QBCore:Server:OnPlayerLoaded')
TriggerEvent('QBCore:Client:OnPlayerLoaded')
PostSpawnPlayer()
end)
elseif type == 'house' then
PreSpawnPlayer()
TriggerEvent('qb-houses:client:enterOwnedHouse', location)
Expand Down
12 changes: 12 additions & 0 deletions locales/ua.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
local Translations = {
ui = {
last_location = "Останнє місце",
confirm = "Підтвердити",
where_would_you_like_to_start = "Звідки ви бажаєте розпочати?",
}
}

Lang = Lang or Locale:new({
phrases = Translations,
warnOnMissing = true
})
Loading