Fix: traits handling

media/lua/client/TOC/Controllers/DataController.lua

@@ -97,14 +97,7 @@ function DataController:setup(key)
     -- self.tocData.isInitializing = false
     -- ModData.add(key, self.tocData)
 
-
+    triggerEvent("OnSetupTocData")
-
-    -- FIX THIS THING HERE ISN'T REALLY CORRECT BUT IT'S A WORKAROUND UNTIL WE FIGURE IT OUT
-    -- The issue is that we need to do this once, not every single time we load data.
-    -- Manage their traits
-    local LocalPlayerController = require("TOC/Controller/LocalPlayerController")
-    LocalPlayerController.ManageTraits(getPlayer())
-
 end
 
 ---In case of desync between the table on ModData and the table here

media/lua/client/TOC/Controllers/LocalPlayerController.lua

@@ -46,11 +46,13 @@ function LocalPlayerController.InitializePlayer(isForced)
     SetHealthPanelTOC()
 end
 
----Handles the traits
----@param playerObj IsoPlayer
-function LocalPlayerController.ManageTraits(playerObj)
 
-    -- FIX This can fail if we haven't initialized TOC in time`
+
+---Handles the traits
+function LocalPlayerController.ManageTraits()
+
+    -- Local player
+    local playerObj = getPlayer()
 
     local AmputationHandler = require("TOC/Handlers/AmputationHandler")
     for k, v in pairs(StaticData.TRAITS_BP) do
@@ -67,6 +69,11 @@ function LocalPlayerController.ManageTraits(playerObj)
     end
 end
 
+-- We need to manage traits when we're done setupping everything
+-- It shouldn't be done every single time we initialize the player, fetching data, etc.
+Events.OnSetupTocData.Add(LocalPlayerController.ManageTraits)
+
+
 ----------------------------------------------------------
 
 --* Health *--

media/lua/client/TOC/Events.lua

@@ -2,3 +2,4 @@
 LuaEventManager.AddEvent("OnAmputatedLimb")     --Triggered when a limb has been amputated
 LuaEventManager.AddEvent("OnProsthesisUnequipped")
 LuaEventManager.AddEvent("OnReceivedTocData")   -- Triggered when TOC data is ready
+LuaEventManager.AddEvent("OnSetupTocData")      -- Triggered when TOC has been setupped