diff --git a/lua/autorun/gmod_integration.lua b/lua/autorun/gmod_integration.lua index d54ed83..487b5dd 100644 --- a/lua/autorun/gmod_integration.lua +++ b/lua/autorun/gmod_integration.lua @@ -4,9 +4,9 @@ if game.SinglePlayer() then return end // Variables // -gmInte = gmInte || {} -gmInte.version = "0.1.2" -gmInte.config = gmInte.config || {} +gmInte = {} +gmInte.version = "0.1.3" +gmInte.config = {} // // Functions @@ -24,10 +24,11 @@ local function loadConfig() local oldConfig = util.JSONToTable(file.Read("gm_integration/config.json", "DATA")) if (!oldConfig.version || (oldConfig.version < gmInte.version)) then - if (oldConfig.version < "0.1.2") then + if (oldConfig.version && (oldConfig.version < "0.1.2")) then gmInte.config.id = oldConfig.id gmInte.config.token = oldConfig.token else + print(" | Merging Config | gmod_integration/sv_config.lua") table.Merge(gmInte.config, oldConfig) end gmInte.config.version = gmInte.version diff --git a/lua/gmod_integration/server/sv_websocket.lua b/lua/gmod_integration/server/sv_websocket.lua index 42e1ac0..d96b9ee 100644 --- a/lua/gmod_integration/server/sv_websocket.lua +++ b/lua/gmod_integration/server/sv_websocket.lua @@ -31,4 +31,14 @@ function socket:onError(txt) gmInte.logError("WebSocket Error: " .. txt) end -socket:open() \ No newline at end of file +function gmInte.websocketSend(data) + socket:send(util.TableToJSON(data)) +end + +hook.Add("InitPostEntity", "gmInte:ServerReady:WebSocket", function() + if (gmInte.config.websocket) then wsConnect() end +end) + +if (gmInte.config.debug) then wsConnect() end + +print(gmInte.config.debug && "WebSocket Debug Mode" || "WebSocket") \ No newline at end of file