FumeNodes/ND_Core
1
0
Fork 0
mirror of https://github.com/ND-Framework/ND_Core.git synced 2026-08-17 05:56:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

tweak(server/player): return before setting active

Browse Source
This commit is contained in:
Andyyy7666
2023-08-29 03:20:04 +02:00
parent 8eac50be2d
commit 76ae3a1c44
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/player.lua
View File

@@ -259,7 +259,7 @@ local function createCharacterTable(info)
-- Set the character as the players active character/currently playing character -- Set the character as the players active character/currently playing character
function self.active() function self.active()
local char = NDCore.players[self.source] local char = NDCore.players[self.source]
if char and char.id == self.id then return true end if char and char.id == self.id then return end
if char then char.unload() end if char then char.unload() end
for identifierType, identifier in pairs(self.identifiers) do for identifierType, identifier in pairs(self.identifiers) do
if lib.table.contains(Config.admins, ("%s:%s"):format(identifierType, identifier)) then if lib.table.contains(Config.admins, ("%s:%s"):format(identifierType, identifier)) then
@@ -272,7 +272,6 @@ local function createCharacterTable(info)
NDCore.players[self.source] = self NDCore.players[self.source] = self
TriggerEvent("ND:characterLoaded", self) TriggerEvent("ND:characterLoaded", self)
self.triggerEvent("ND:characterLoaded", self) self.triggerEvent("ND:characterLoaded", self)
return true
end end
---@param name string ---@param name string
@@ -438,8 +437,12 @@ end
---@param id number ---@param id number
---@return table ---@return table
function NDCore.setActiveCharacter(src, id) function NDCore.setActiveCharacter(src, id)
if not src then return end local char = NDCore.players[src]
if not src or char and char.id == id then return end
local character = NDCore.fetchCharacter(id, src) local character = NDCore.fetchCharacter(id, src)
if not character then return end
character.name = GetPlayerName(src) character.name = GetPlayerName(src)
character.active() character.active()
return character return character