Skip to content

Commit

Permalink
fix(server/player): do not zero metadata on logout (#438)
Browse files Browse the repository at this point in the history
statebags shouldn't be nil on logout but maybe if you got potatoes
connected to potatoes then you'll be a nil bagholder
  • Loading branch information
solareon committed Apr 11, 2024
1 parent 6d33eb7 commit 91e8e1b
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions server/player.lua
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ function CheckPlayerData(source, playerData)
playerState:set('hunger', playerData.metadata.hunger, true)
playerState:set('thirst', playerData.metadata.thirst, true)
playerState:set('stress', playerData.metadata.stress, true)

playerData.metadata.isdead = playerData.metadata.isdead or false
playerData.metadata.inlaststand = playerData.metadata.inlaststand or false
playerData.metadata.armor = playerData.metadata.armor or 0
Expand Down Expand Up @@ -438,9 +438,9 @@ function Logout(source)
local player = GetPlayer(source)
if not player then return end
local playerState = Player(source)?.state
player.PlayerData.metadata.hunger = playerState.hunger or 0
player.PlayerData.metadata.thirst = playerState.thirst or 0
player.PlayerData.metadata.stress = playerState.stress or 0
player.PlayerData.metadata.hunger = playerState?.hunger or player.PlayerData.metadata.hunger
player.PlayerData.metadata.thirst = playerState?.thirst or player.PlayerData.metadata.thirst
player.PlayerData.metadata.stress = playerState?.stress or player.PlayerData.metadata.stress

TriggerClientEvent('QBCore:Client:OnPlayerUnload', source)
TriggerEvent('QBCore:Server:OnPlayerUnload', source)
Expand All @@ -452,9 +452,6 @@ function Logout(source)
QBX.Players[source] = nil
GlobalState.PlayerCount -= 1
TriggerClientEvent('qbx_core:client:playerLoggedOut', source)
playerState:set('stress', 100, true)
playerState:set('thirst', 100, true)
playerState:set('hunger', 100, true)
end

exports('Logout', Logout)
Expand Down

0 comments on commit 91e8e1b

Please sign in to comment.