From 14a90a0f73cab3e346beb274f3604c72d8209ea3 Mon Sep 17 00:00:00 2001 From: Redox Date: Mon, 23 Sep 2024 01:02:25 +0200 Subject: [PATCH 1/2] Use ACF_PersistedData_Loaded hook --- lua/acf/core/globals.lua | 4 +--- lua/acf/core/networking/data_vars/data_vars_sh.lua | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lua/acf/core/globals.lua b/lua/acf/core/globals.lua index a1524a139..8765035ae 100644 --- a/lua/acf/core/globals.lua +++ b/lua/acf/core/globals.lua @@ -153,7 +153,7 @@ end if SERVER then util.AddNetworkString("ACF_UpdateEntity") - hook.Add("PlayerConnect", "ACF Workshop Content", function() + hook.Add("ACF_PersistedData_Loaded", "ACF Workshop Content", function() if ACF.WorkshopContent then resource.AddWorkshop("2183798463") -- Playermodel Seats resource.AddWorkshop("3248769144") -- ACF-3 Base @@ -164,8 +164,6 @@ if SERVER then resource.AddWorkshop("2099387099") -- ACF-3 Removed Sounds resource.AddWorkshop("2782407502") -- ACF-3 Removed Models end - - hook.Remove("PlayerConnect", "ACF Workshop Content") end) elseif CLIENT then CreateClientConVar("acf_show_entity_info", 1, true, false, "Defines under what conditions the info bubble on ACF entities will be shown. 0 = Never, 1 = When not seated, 2 = Always", 0, 2) diff --git a/lua/acf/core/networking/data_vars/data_vars_sh.lua b/lua/acf/core/networking/data_vars/data_vars_sh.lua index 3df30c2cf..6f9960c54 100644 --- a/lua/acf/core/networking/data_vars/data_vars_sh.lua +++ b/lua/acf/core/networking/data_vars/data_vars_sh.lua @@ -139,6 +139,7 @@ do -- Data persisting SetFunction(Key, Default) end + hook.Run("ACF_PersistedData_Loaded") hook.Remove("Initialize", "ACF Load Persisted Data") end) end From 79ddf9a02703287f01b015369deeae6616b6ca2d Mon Sep 17 00:00:00 2001 From: TwistedTail <8784231+TwistedTail@users.noreply.github.com> Date: Sun, 22 Sep 2024 21:31:25 -0300 Subject: [PATCH 2/2] Renamed new hooks - Renamed hooks to be consistent with the rest of the codebase. --- lua/acf/core/globals.lua | 2 +- lua/acf/core/networking/data_vars/data_vars_sh.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/acf/core/globals.lua b/lua/acf/core/globals.lua index 8765035ae..3287ffba8 100644 --- a/lua/acf/core/globals.lua +++ b/lua/acf/core/globals.lua @@ -153,7 +153,7 @@ end if SERVER then util.AddNetworkString("ACF_UpdateEntity") - hook.Add("ACF_PersistedData_Loaded", "ACF Workshop Content", function() + hook.Add("ACF_OnLoadPersistedData", "ACF Workshop Content", function() if ACF.WorkshopContent then resource.AddWorkshop("2183798463") -- Playermodel Seats resource.AddWorkshop("3248769144") -- ACF-3 Base diff --git a/lua/acf/core/networking/data_vars/data_vars_sh.lua b/lua/acf/core/networking/data_vars/data_vars_sh.lua index 6f9960c54..d8cd94914 100644 --- a/lua/acf/core/networking/data_vars/data_vars_sh.lua +++ b/lua/acf/core/networking/data_vars/data_vars_sh.lua @@ -139,7 +139,7 @@ do -- Data persisting SetFunction(Key, Default) end - hook.Run("ACF_PersistedData_Loaded") + hook.Run("ACF_OnLoadPersistedData") hook.Remove("Initialize", "ACF Load Persisted Data") end) end