Merge pull request #1441 from esx-framework/dev

ESX 1.11.0 Release

Author: Mycroft-Studios

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "Lua.diagnostics.globals": [
+        "MySQL",
+        "GetPlayerTimeOnline",
+        "SetEntityOrphanMode"
+    ]
+}

CODE_OF_CONDUCT.md

@@ -78,17 +78,3 @@ This code of conduct and its related procedures also applies to unacceptable beh
 ## 10. Contact info
 
 [email protected]
-
-## 11. License and attribution
-
-The Citizen Code of Conduct is distributed by [Stumptown Syndicate](http://stumptownsyndicate.org) under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/). 
-
-Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
-
-_Revision 2.3. Posted 6 March 2017._
-
-_Revision 2.2. Posted 4 February 2016._
-
-_Revision 2.1. Posted 23 June 2014._
-
-_Revision 2.0, adopted by the [Stumptown Syndicate](http://stumptownsyndicate.org) board on 10 January 2013. Posted 17 March 2013._

[core]/cron/fxmanifest.lua

@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'Allows resources to Run tasks at specific intervals.'
 lua54 'yes'
-version '1.10.10'
+version '1.11.0'
 
 server_script 'server/main.lua'

[core]/cron/server/main.lua

@@ -17,15 +17,16 @@ function OnTime(time)
     for i = 1, #Jobs, 1 do
         local scheduledTimestamp = os.time({
             hour = Jobs[i].h,
-            minute = Jobs[i].m,
-            second = 0, -- Assuming tasks run at the start of the minute
+            min = Jobs[i].m,
+            sec = 0, -- Assuming tasks run at the start of the minute
             day = os.date("%d", time),
             month = os.date("%m", time),
             year = os.date("%Y", time),
         })
 
         if time >= scheduledTimestamp and (not LastTime or LastTime < scheduledTimestamp) then
-            Jobs[i].cb(Jobs[i].h, Jobs[i].m)
+            local d = os.date('*t', scheduledTimestamp).wday
+            Jobs[i].cb(d, Jobs[i].h, Jobs[i].m)
         end
     end
 end

[core]/es_extended/client/common.lua

@@ -1,8 +1,30 @@
-exports("getSharedObject", function()
-    return ESX
-end)
+Core = {}
+Core.Input = {}
+Core.Events = {}
+
+ESX.PlayerData = {}
+ESX.PlayerLoaded = false
+ESX.playerId = PlayerId()
+ESX.serverId = GetPlayerServerId(ESX.playerId)
+
+ESX.UI = {}
+ESX.UI.Menu = {}
+ESX.UI.Menu.RegisteredTypes = {}
+ESX.UI.Menu.Opened = {}
+
+ESX.Game = {}
+ESX.Game.Utils = {}
+
+CreateThread(function()
+    while not Config.Multichar do
+        Wait(100)
 
-AddEventHandler("esx:getSharedObject", function()
-    local Invoke = GetInvokingResource()
-    error(("Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
+        if NetworkIsPlayerActive(ESX.playerId) then
+            ESX.DisableSpawnManager()
+            DoScreenFadeOut(0)
+            Wait(500)
+            TriggerServerEvent("esx:onPlayerJoined")
+            break
+        end
+    end
 end)