Solve minor bugs

Author: AllRoundJonU

it_bridge/fxmanifest.lua

@@ -5,7 +5,7 @@ games {'gta5'}
 
 name 'it_bridge'
 author '@allroundjonu'
-version '1.0.7'
+version '1.0.8'
 
 identifier 'it_bridge'
 

it_bridge/modules/framework/server/getOnlinePlayers.lua

@@ -1,11 +1,10 @@
 ---
 ---@return table | nil onlinePlayers 
 function it.getOnlinePlayers()
-    local onlinePlayers = {}
+    local onlinePlayerData = {}
 
     if it.framework == Framework.ESX then
         local onlinePlayersESX = CoreObject.GetExtendedPlayers()
-        local onlinePlayerData = {}
         for _, player in pairs(onlinePlayersESX) do
             local currentPlayerData = it.getPlayerData(player.source)
             if currentPlayerData then
@@ -14,7 +13,6 @@ function it.getOnlinePlayers()
         end
     elseif it.framework == Framework.QBCore then
         local onlinePlayersQBCore = CoreObject.Functions.GetQBPlayers()
-        local onlinePlayerData = {}
         for playerId, _ in pairs(onlinePlayersQBCore) do
             local currentPlayerData = it.getPlayerData(playerId)
             if currentPlayerData then
@@ -23,7 +21,6 @@ function it.getOnlinePlayers()
         end
     elseif it.framework == Framework.QBOX then
         local onlinePlayersQBOX = exports.qbx_core:GetQBPlayers()
-        local onlinePlayerData = {}
         for playerId, _ in pairs(onlinePlayersQBOX) do
             local currentPlayerData = it.getPlayerData(playerId)
             if currentPlayerData then
@@ -32,19 +29,18 @@ function it.getOnlinePlayers()
         end
     elseif it.framework == Framework.NDCore then
         local onlinePlayersNDCore =  exports["ND_Core"]:getPlayers()
-        local onlinePlayerData = {}
         for playerId, _ in pairs(onlinePlayersNDCore) do
             local currentPlayerData = it.getPlayerData(playerId)
             if currentPlayerData then
                 table.insert(onlinePlayerData, currentPlayerData)
             end
         end
-        onlinePlayers = onlinePlayerData
     else
         it.print.error("Unsupported framework: " .. tostring(it.framework))
+        return nil
     end
 
-    return onlinePlayers
+    return onlinePlayerData
 end
 
 exports('GetOnlinePlayers', function()

it_bridge/modules/framework/server/getPlayerData.lua

@@ -31,9 +31,9 @@ function it.getPlayerData(source)
             sex = player.sex,
             source = player.source,
             money = {
-                cash = it.getMoney(source, MoneyTypes['cash'][Framework.ESX]),
-                bank = it.getMoney(source, MoneyTypes['bank'][Framework.ESX]),
-                black_money = it.getMoney(source, MoneyTypes['black_money'][Framework.ESX]),
+                cash = it.getMoney(source, 'cash'),
+                bank = it.getMoney(source, 'bank'),
+                black_money = it.getMoney(source, 'black_money'),
             }
         }
     end
@@ -48,9 +48,9 @@ function it.getPlayerData(source)
             sex = player.PlayerData.charinfo.gender,
             source = source,
             money = {
-                cash = it.getMoney(source, MoneyTypes['cash'][Framework.QBCore]),
-                bank = it.getMoney(source, MoneyTypes['bank'][Framework.QBCore]),
-                black_money = it.getMoney(source, MoneyTypes['black_money'][Framework.QBCore]),
+                cash = it.getMoney(source, 'cash'),
+                bank = it.getMoney(source, 'bank'),
+                black_money = it.getMoney(source, 'black_money'),
             }
         }
     end
@@ -65,9 +65,9 @@ function it.getPlayerData(source)
             sex = player.PlayerData.charinfo.gender,
             source = source,
             money = {
-                cash = it.getMoney(source, MoneyTypes['cash'][Framework.QBOX]),
-                bank = it.getMoney(source, MoneyTypes['bank'][Framework.QBOX]),
-                black_money = it.getMoney(source, MoneyTypes['black_money'][Framework.QBOX]),
+                cash = it.getMoney(source, 'cash'),
+                bank = it.getMoney(source, 'bank'),
+                black_money = it.getMoney(source, 'black_money'),
             }
         }
     end
@@ -82,9 +82,8 @@ function it.getPlayerData(source)
             sex = player.gender,
             source = player.source,
             money = {
-                cash = it.getMoney(source, MoneyTypes['cash'][Framework.NDCore]),
-                bank = it.getMoney(source, MoneyTypes['bank'][Framework.NDCore]),
-                black_money = it.getMoney(source, MoneyTypes['black_money'][Framework.NDCore]),
+                cash = it.getMoney(source, 'cash'),
+                bank = it.getMoney(source, 'bank'),
             }
         }
     end

it_bridge/modules/textui/client.lua

@@ -44,6 +44,10 @@ function it.closeTextUI(text)
     if it.textui == TextUI.OX then
         local isOpen, uiText = lib.isTextUIOpen()
         if isOpen then
+            if text == nil then
+                lib.hideTextUI()
+                return true
+            end
             if uiText == text then
                 lib.hideTextUI()
                 return true

it_bridge/modules/variables.lua

@@ -13,7 +13,7 @@ cache = {
     version = GetResourceMetadata(it.name, 'version', 0),
 }
 
-CURRENT_VERSION = '1.0.7'
+CURRENT_VERSION = '1.0.8'
 
 STANDALONE = 'standalone'
 AUTO_DETECT = 'auto-detect'