Merge pull request #2 from robert4049/main

fix: identity shared object and xplayer
Concept-Collective · Dec 9, 2022 · 1da034f · 1da034f
2 parents df2bca9 + 4247e1f
commit 1da034f
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/server/main.lua b/server/main.lua
@@ -1,3 +1,5 @@
+ESX = nil
+
 AddEventHandler('onResourceStart', function(resourceName)
     if (GetCurrentResourceName() ~= resourceName) then
         return
@@ -17,6 +19,7 @@ AddEventHandler('onResourceStart', function(resourceName)
         AddEventHandler('chatMessage', function(source, name, message)
             local playerName
             if config.identity then
+                local xPlayer = ESX.GetPlayerFromId(source)
                 playerName = xPlayer.getName()
             else 
                 playerName = GetPlayerName(source)
@@ -33,13 +36,16 @@ AddEventHandler('onResourceStart', function(resourceName)
             CancelEvent()
         end)
     end
+    if config.identity then
+        ESX = exports["es_extended"]:getSharedObject()
+    end 
 end)
 
 RegisterCommand('ooc', function(source, args, rawCommand)
-    local xPlayer = source
     local playerName
     local msg = rawCommand:sub(5)
     if config.identity then
+        local xPlayer = ESX.GetPlayerFromId(source)
         playerName = xPlayer.getName()
     else 
         playerName = GetPlayerName(source)
@@ -51,10 +57,10 @@ RegisterCommand('ooc', function(source, args, rawCommand)
 end, false)
 
 RegisterCommand('me', function(source, args, rawCommand)
-    local xPlayer = source
     local playerName
     local msg = rawCommand:sub(4)
     if config.identity then
+        local xPlayer = ESX.GetPlayerFromId(source)
         playerName = xPlayer.getName()
     else 
         playerName = GetPlayerName(source)
@@ -66,10 +72,10 @@ RegisterCommand('me', function(source, args, rawCommand)
 end, false)
 
 RegisterCommand('do', function(source, args, rawCommand)
-    local xPlayer = source
     local playerName
     local msg = rawCommand:sub(4)
     if config.identity then
+        local xPlayer = ESX.GetPlayerFromId(source)
         playerName = xPlayer.getName()
     else 
         playerName = GetPlayerName(source)
@@ -81,10 +87,10 @@ RegisterCommand('do', function(source, args, rawCommand)
 end, false)
 
 RegisterCommand('news', function(source, args, rawCommand)
-    local xPlayer = source
     local playerName
     local msg = rawCommand:sub(5)
     if config.identity then
+        local xPlayer = ESX.GetPlayerFromId(source)
         playerName = xPlayer.getName()
     else 
         playerName = GetPlayerName(source)
@@ -96,10 +102,10 @@ RegisterCommand('news', function(source, args, rawCommand)
 end, false)
 
 RegisterCommand('ad', function(source, args, rawCommand)
-    local xPlayer = source
     local playerName
     local msg = rawCommand:sub(4)
     if config.identity then
+        local xPlayer = ESX.GetPlayerFromId(source)
         playerName = xPlayer.getName()
     else 
         playerName = GetPlayerName(source)
@@ -111,10 +117,10 @@ RegisterCommand('ad', function(source, args, rawCommand)
 end, false)
 
 RegisterCommand('twt', function(source, args, rawCommand)
-    local xPlayer = source
     local playerName
     local msg = rawCommand:sub(5)
     if config.identity then
+        local xPlayer = ESX.GetPlayerFromId(source)
         playerName = xPlayer.getName()
     else 
         playerName = GetPlayerName(source)
@@ -126,10 +132,10 @@ RegisterCommand('twt', function(source, args, rawCommand)
 end, false)
 
 RegisterCommand('anon', function(source, args, rawCommand)
-    local xPlayer = source
     local playerName
     local msg = rawCommand:sub(5)
     if config.identity then
+        local xPlayer = ESX.GetPlayerFromId(source)
         playerName = xPlayer.getName()
     else 
         playerName = GetPlayerName(source)