Skip to content
This repository was archived by the owner on Apr 24, 2019. It is now read-only.

Commit

Permalink
Merge pull request #43 from FiveM-Scripts/hotfix
Browse files Browse the repository at this point in the history
v1.2.4
  • Loading branch information
ghermans authored Nov 17, 2017
2 parents b0591d2 + 36d4d2b commit 8009325
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 19 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog
All notable changes to this project will be documented in this file.

## v1.2.4
This update contains a hotfix regarding issue #42, no other changes have been made.

## v1.2.3
- Added language support.
- Added money stats to the pause menu.
Expand Down
13 changes: 11 additions & 2 deletions client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,18 @@ AddEventHandler("playerSpawned", function(spawn)

GiveWeaponToPed(player, GetHashKey("WEAPON_PISTOL"), 100, false, true)
GiveWeaponToPed(player, GetHashKey("WEAPON_KNIFE"), true, true)

spawned = true
TriggerServerEvent("fs_freemode:playerSpawned")
TriggerServerEvent("fs_freemode:initStats")

end)

Citizen.CreateThread(function()
while true do
Wait(60000)
if spawned then
TriggerServerEvent("fs_freemode:initStats")
end
end
end)

Citizen.CreateThread(function()
Expand Down
20 changes: 3 additions & 17 deletions server.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local version = 'v1.2.3'
local version = 'v1.2.4'

TriggerEvent("es:setDefaultSettings", {
debugInformation = false,
Expand All @@ -21,23 +21,9 @@ end)
RegisterServerEvent("fs_freemode:initStats")
AddEventHandler("fs_freemode:initStats", function()
local src = source
local function GetStatsData()
SetTimeout(3000, function()
TriggerEvent('es:getPlayers', function(users)
for k,v in pairs(users)do
if users[k] ~= nil then
TriggerEvent('es:getPlayerFromId', src, function(user)
TriggerClientEvent('fs_freemode:initStats', src, user.getMoney())
end)
end
end
end)

GetStatsData()
TriggerEvent('es:getPlayerFromId', src, function(user)
TriggerClientEvent('fs_freemode:initStats', src, user.getMoney())
end)
end

GetStatsData()
end)

RegisterServerEvent("fs_freemode:loadWeapons")
Expand Down

0 comments on commit 8009325

Please sign in to comment.