restructure ambulancejob #69
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
N0tNvll
commented
Jan 15, 2025
N0tNvll
commented
- Separate files in different files for a better structure
- Remove parts from deathscreen to make in independent from ambulancejob
- Added check for dead status in bills
- Created a function to get the status dead of the player in case that wont be present in the list always be false like expected
- Added checks in remove and add inventory items for valid items
chore: merge dev into main
Arctos2win
requested changes
Jan 18, 2025
client/deathHandler.lua
Outdated
| @@ -0,0 +1,177 @@ | |||
| RegisterNetEvent('esx_ambulancejob:clsearch') | |||
| AddEventHandler('esx_ambulancejob:clsearch', function(medicId) | |||
There was a problem hiding this comment.
Remove the AddEventHandler where there already is a RegisterNetEvent present
( Everywhere in the resource )
client/deathHandler.lua
Outdated
| AddEventHandler('esx_ambulancejob:clsearch', function(medicId) | ||
| local playerPed = PlayerPedId() | ||
|
|
||
| if isDead then |
There was a problem hiding this comment.
avoid to much code inside of if statements
( if not isDead then return end )
( Everywhere in the resource work with early returns where possible )
Arctos2win
approved these changes
Jan 27, 2025
| RegisterNetEvent('esx_ambulancejob:clsearch', function(medicId) | ||
| local playerPed = PlayerPedId() | ||
|
|
||
| if isDead then |
There was a problem hiding this comment.
avoid nestling
if not isDead then return end
| RegisterNetEvent('esx_ambulancejob:revive', function() | ||
| local playerPed = PlayerPedId() | ||
|
|
||
| if isDead then |
| isBusy = true | ||
|
|
||
| ESX.TriggerServerCallback('esx_ambulancejob:getItemAmount', function(quantity) | ||
| if quantity > 0 then |
| RegisterNetEvent('esx_ambulancejob:setDeadPlayers', function(_deadPlayers) | ||
| deadPlayers = _deadPlayers | ||
|
|
||
| if isOnDuty then |
| RegisterNetEvent('esx_ambulancejob:PlayerDistressed', function(playerId, playerCoords) | ||
| deadPlayers[playerId] = 'distress' | ||
|
|
||
| if isOnDuty then |
| props = vehicle.props, | ||
| type = type | ||
| } | ||
| if not isDead then |
|
Deathhandler, Deathcam etc. is supposed to be extracted into the new resource "esx_deathscreen". Basically anything directly related to death. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.