diff --git a/src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs b/src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs index 17bd8abb..2be2b824 100644 --- a/src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs +++ b/src/Infrastructure/Scripting/Lua/Modules/LuaServerModule.cs @@ -21,27 +21,31 @@ public static void Register(Table greg, Script script, string modId) { try { - var servers = UnityEngine.Object.FindObjectsOfType(); var result = new Table(script); - int i = 1; - foreach (var s in servers) + var nm = Il2Cpp.NetworkMap.instance; + if (nm != null && nm.servers != null) { - try + int i = 1; + foreach (var kvp in nm.servers) { - var info = new Table(script); - info["id"] = s.ServerID ?? s.GetHashCode().ToString(); - info["hash"] = s.GetHashCode(); - info["is_on"] = s.isOn; - info["is_broken"] = s.isBroken; - info["server_type"] = (int)s.serverType; - info["size_u"] = s.sizeInU; - var pos = s.transform?.position ?? UnityEngine.Vector3.zero; - info["x"] = (double)pos.x; - info["y"] = (double)pos.y; - info["z"] = (double)pos.z; - result[i++] = info; + var s = kvp.Value; + try + { + var info = new Table(script); + info["id"] = s.ServerID ?? s.GetHashCode().ToString(); + info["hash"] = s.GetHashCode(); + info["is_on"] = s.isOn; + info["is_broken"] = s.isBroken; + info["server_type"] = (int)s.serverType; + info["size_u"] = s.sizeInU; + var pos = s.transform?.position ?? UnityEngine.Vector3.zero; + info["x"] = (double)pos.x; + info["y"] = (double)pos.y; + info["z"] = (double)pos.z; + result[i++] = info; + } + catch { } } - catch { } } return result; } @@ -62,8 +66,7 @@ public static void Register(Table greg, Script script, string modId) { return nm.servers.Count; } - var servers = UnityEngine.Object.FindObjectsOfType(); - return servers?.Count ?? 0; + return 0; } catch { return 0; } }); @@ -80,18 +83,25 @@ public static void Register(Table greg, Script script, string modId) { try { - var servers = UnityEngine.Object.FindObjectsOfType(); - foreach (var s in servers) + var nm = Il2Cpp.NetworkMap.instance; + if (nm != null && nm.servers != null) { - try + if (nm.servers.Count == 0) return false; + var serversList = new System.Collections.Generic.List(); + foreach (var kvp in nm.servers) serversList.Add(kvp.Value); + + foreach (var s in serversList) { - if (s.GetHashCode() == hash && s.isBroken) + try { - s.RepairDevice(); - return true; + if (s.GetHashCode() == hash && s.isBroken) + { + s.RepairDevice(); + return true; + } } + catch { } } - catch { } } return false; } @@ -104,18 +114,25 @@ public static void Register(Table greg, Script script, string modId) try { int repaired = 0; - var servers = UnityEngine.Object.FindObjectsOfType(); - foreach (var s in servers) + var nm = Il2Cpp.NetworkMap.instance; + if (nm != null && nm.servers != null) { - try + if (nm.servers.Count == 0) return 0; + var serversList = new System.Collections.Generic.List(); + foreach (var kvp in nm.servers) serversList.Add(kvp.Value); + + foreach (var s in serversList) { - if (s.isBroken) + try { - s.RepairDevice(); - repaired++; + if (s.isBroken) + { + s.RepairDevice(); + repaired++; + } } + catch { } } - catch { } } return repaired; }