Skip to content
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

🐛 Added back the possibility to use skipSelection in qb-multicharacter #201

Merged
merged 3 commits into from
Apr 1, 2024
Merged

🐛 Added back the possibility to use skipSelection in qb-multicharacter #201

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c50b6f
🐛 added back the possibility to use skipSelection in qb-multicharacter
MonsieurBibo Apr 1, 2024
7fefe08
⏪ Reverted the order of dependencies and removed the homeBlip consequ…
MonsieurBibo Apr 1, 2024
ceefd6b
⏪ Re-added the homeBlip in the `qb-multicharacter:client:spawnLastLoc…
MonsieurBibo Apr 1, 2024
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
82 changes: 68 additions & 14 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,20 @@ https://github.com/complexza/ps-housing/assets/74205343/0ff26e7f-1341-45fc-8fc6-
RegisterNetEvent('qb-multicharacter:server:loadUserData', function(cData)
local src = source
if QBCore.Player.Login(src, cData.citizenid) then
local Player = QBCore.Functions.GetPlayer(src)
local Name = Player.PlayerData.charinfo.firstname .. " " .. Player.PlayerData.charinfo.lastname
repeat
Wait(10)
until hasDonePreloading[src]
print('^2[qb-core]^7 '..GetPlayerName(src)..' (Citizen ID: '..cData.citizenid..') has succesfully loaded!')
print('[' .. GetPlayerName(src) .. '] - ^2' .. Name .. '^7 (Citizen ID: ' .. cData.citizenid .. ') has succesfully loaded!')
QBCore.Commands.Refresh(src)
TriggerClientEvent('ps-housing:client:setupSpawnUI', src, cData)
TriggerEvent("qb-log:server:CreateLog", "joinleave", "Loaded", "green", "**".. GetPlayerName(src) .. "** (<@"..(QBCore.Functions.GetIdentifier(src, 'discord'):gsub("discord:", "") or "unknown").."> | ||" ..(QBCore.Functions.GetIdentifier(src, 'ip') or 'undefined') .. "|| | " ..(QBCore.Functions.GetIdentifier(src, 'license') or 'undefined') .." | " ..cData.citizenid.." | "..src..") loaded..")
if Config.SkipSelection then
local coords = json.decode(cData.position)
TriggerClientEvent('qb-multicharacter:client:spawnLastLocation', src, coords, cData)
else
TriggerClientEvent('ps-housing:client:setupSpawnUI', src, cData)
end
TriggerEvent("qb-log:server:CreateLog", "joinleave", "Loaded", "green", "**" .. GetPlayerName(src) .. "** - " .. Name .. " (<@" .. (QBCore.Functions.GetIdentifier(src, 'discord'):gsub("discord:", "") or "unknown") .. "> | ||" .. (QBCore.Functions.GetIdentifier(src, 'ip') or 'undefined') .. "|| | " .. (QBCore.Functions.GetIdentifier(src, 'license') or 'undefined') .. " | " .. cData.citizenid .. " | " .. src .. ") loaded..")
end
end)
```
Expand All @@ -115,8 +122,42 @@ RegisterNetEvent('qb-multicharacter:server:createCharacter', function(data)
GiveStarterItems(src)
end
end)

```
### 2. Find the following events in `qb-spawn` and change in client/client.lua event to:
### 2. Find the following event in `qb-multicharacter` and change in client/main.lua event to:
`qb-multicharacter > client > main.lua`

```lua
RegisterNetEvent('qb-multicharacter:client:spawnLastLocation', function(coords, cData)
local result = lib.callback.await('ps-housing:cb:GetOwnedApartment', source, cData.citizenid)
if result then
TriggerEvent("apartments:client:SetHomeBlip", result.type)
end
local ped = PlayerPedId()
SetEntityCoords(ped, coords.x, coords.y, coords.z)
SetEntityHeading(ped, coords.w)
FreezeEntityPosition(ped, false)
SetEntityVisible(ped, true)
local PlayerData = QBCore.Functions.GetPlayerData()
local insideMeta = PlayerData.metadata["inside"]
DoScreenFadeOut(500)
if insideMeta.propertyId then
TriggerServerEvent('ps-housing:server:enterProperty', tostring(insideMeta.propertyId))
else
SetEntityCoords(ped, coords.x, coords.y, coords.z)
SetEntityHeading(ped, coords.w)
FreezeEntityPosition(ped, false)
SetEntityVisible(ped, true)
end
TriggerServerEvent('QBCore:Server:OnPlayerLoaded')
TriggerEvent('QBCore:Client:OnPlayerLoaded')
Wait(2000)
DoScreenFadeIn(250)
end)
```


### 3. Find the following events in `qb-spawn` and change in client/client.lua event to:

`qb-spawn > client.lua > line 51 > 'qb-spawn:client:setupSpawns' event`
```lua
Expand Down Expand Up @@ -238,7 +279,7 @@ QBCore.Functions.CreateCallback('qb-spawn:server:getOwnedHouses', function(_, cb
end)
```

### 3. Find the following events in `qb-garages` and change:
### 4. Find the following events in `qb-garages` and change:
`qb-garages > server > main.lua > around line 120` on event `qb-garage:server:checkOwnership`

Replace
Expand Down Expand Up @@ -276,19 +317,19 @@ RegisterNetEvent('qb-garages:client:removeHouseGarage', function(house)
end)
```

### 4. Run the `properties.sql` file, but be cautious. If a table named `properties` already exists in your database, this operation will drop it, resulting in the loss of all its data.
### 5. Run the `properties.sql` file, but be cautious. If a table named `properties` already exists in your database, this operation will drop it, resulting in the loss of all its data.

### 5. Delete default [qb-apartments](https://github.com/qbcore-framework/qb-apartments)
### 6. Delete default [qb-apartments](https://github.com/qbcore-framework/qb-apartments)

### 6. Delete default [qb-houses](https://github.com/qbcore-framework/qb-houses)
### 7. Delete default [qb-houses](https://github.com/qbcore-framework/qb-houses)

### 7. Delete `qb-apartments/config.lua` references in `qb-spawn`, `qb-multicharacter` and `qb-phone` fxmanifest.lua (and any other scripts that may reference it).
### 8. Delete `qb-apartments/config.lua` references in `qb-spawn`, `qb-multicharacter` and `qb-phone` fxmanifest.lua (and any other scripts that may reference it).

### 8. Ensure ps-realtor above ps-housing.
### 9. Ensure ps-realtor above ps-housing.

### 9. In your server.cfg, add `ensure ox_lib` above all other resources
### 10. In your server.cfg, add `ensure ox_lib` above all other resources

### 10. Install the dependencies below.
### 11. Install the dependencies below.

# Dependencies
1. [ps-realtor](https://github.com/Project-Sloth/ps-realtor)
Expand All @@ -297,14 +338,27 @@ end)
4. [ox_target](https://github.com/overextended/ox_target) or [qb-target](https://github.com/qbcore-framework/qb-target) - Change in [Config](https://github.com/Project-Sloth/ps-housing/blob/3c0f197b6d639f13235598393c84aac8d23d5f7a/shared/config.lua#L8), default is qb-target.

## For reference your server.cfg should be ensured like below:
* We highly recommend making a folder named [ps-housing] and add `ps-realtor`, `fivem-freecam`, `ox_lib`, `ps-core`, `ps-housing` inside the folder.
MonsieurBibo marked this conversation as resolved.
Show resolved Hide resolved

* We highly recommend making a folder named [ps-housing] and add `ps-realtor`, `fivem-freecam`, `ps-core`, `ps-housing` inside the folder.

```
ensure ox_lib
MonsieurBibo marked this conversation as resolved.
Show resolved Hide resolved
ensure ps-housing
ensure ps-realtor
ensure fivem-freecam
```
* `ox_lib` **must run before** `qb-multicharacter`, so your server.cfg should be like :
MonsieurBibo marked this conversation as resolved.
Show resolved Hide resolved


```lua
ensure ox_lib
-- ...
ensure [qb] -- with qb-multicharacter
-- ...
ensure [ps-housing]
-- ...
```


## End of Installation

# Migrating houses and apartments from qb-houses and qb-apartments
Expand Down