From bc0a2b89b8b5cca2a6f7f11753a926c9d930dbb7 Mon Sep 17 00:00:00 2001 From: zznty <94796179+zznty@users.noreply.github.com> Date: Wed, 14 Dec 2022 19:57:14 +0700 Subject: [PATCH] fix entity updates and steam errors on game exit --- Torch.Server/packages.lock.json | 50 ++++++++++++------------- Torch/Patches/ObjectFactoryInitPatch.cs | 5 +-- Torch/Torch.csproj | 4 +- Torch/VRageGame.cs | 2 + Torch/packages.lock.json | 50 ++++++++++++------------- 5 files changed, 56 insertions(+), 55 deletions(-) diff --git a/Torch.Server/packages.lock.json b/Torch.Server/packages.lock.json index 8ec4a94..2b66513 100644 --- a/Torch.Server/packages.lock.json +++ b/Torch.Server/packages.lock.json @@ -162,10 +162,10 @@ }, "HarmonyX": { "type": "Transitive", - "resolved": "2.10.2-prerelease", - "contentHash": "a9wXURpkmi5aGTHEQiNCWv9DSKugpQLgT315wC1+zcnuxy5iUqgm7y7seH9IGDsWv7I33o6sGCUcGFAECsKusw==", + "resolved": "2.10.2-prerelease.1", + "contentHash": "5hbH0ENhQ+JV7tk63fQ2ab7MtplRHKJYH1JfIjG39rlltHNXxAcGJh05an+SQbVRV4EoP/+Qm9w9BrLc3RwRMA==", "dependencies": { - "MonoModReorg.RuntimeDetour": "22.11.17-prerelease.1", + "MonoModReorg.RuntimeDetour": "22.11.21-prerelease.2", "System.Reflection.Emit": "4.7.0", "System.Reflection.Emit.Lightweight": "4.7.0" } @@ -325,48 +325,48 @@ }, "MonoModReorg.Backports": { "type": "Transitive", - "resolved": "22.11.17-prerelease.1", - "contentHash": "MZXad6VJQgkFd5d4MqRcBI0EPhSDFlCl590L1rFKBJC2BqZR6DO2ZjAsRNtP8JyomFp+JzDJIqOIR+YgoWkhAg==", + "resolved": "22.11.21-prerelease.2", + "contentHash": "69T6jjA5nx29jLkdqtfXKlJ8sMqIlc6czNDTomy0rbM68W0xo2JRJBgsu2mroBuqx7nvUdX+zIU6k1edS/pPbw==", "dependencies": { - "MonoModReorg.ILHelpers": "22.11.17-prerelease.1" + "MonoModReorg.ILHelpers": "22.11.21-prerelease.2" } }, "MonoModReorg.Core": { "type": "Transitive", - "resolved": "22.11.17-prerelease.1", - "contentHash": "2I3CRne3mAPW+z46/fmallENRCBD6ufa4sZnF7V5FleKFEwSxLkejZQfuvB/Jt4DaHo8b9ktly5UGpgcYpAOIQ==", + "resolved": "22.11.21-prerelease.2", + "contentHash": "gDoxu4aAF6TeOo8rsrj5prq2X36i12ch6NeRHu/Ct0H3qoPDHuEQ6JMJN/Eiy45YrLNEN7C5+Ku4BrNX4nwVQg==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoModReorg.Backports": "22.11.17-prerelease.1", - "MonoModReorg.ILHelpers": "22.11.17-prerelease.1", - "MonoModReorg.Utils": "22.11.17-prerelease.1" + "MonoModReorg.Backports": "22.11.21-prerelease.2", + "MonoModReorg.ILHelpers": "22.11.21-prerelease.2", + "MonoModReorg.Utils": "22.11.21-prerelease.2" } }, "MonoModReorg.ILHelpers": { "type": "Transitive", - "resolved": "22.11.17-prerelease.1", - "contentHash": "waeN4kdsQf2cXnXJd6SpqEfp4p+8kvcftcwijkSpq8I4fPGOagfCKNKRtDo5raRsi6PuCTK+dpljRsSOYQX6vg==" + "resolved": "22.11.21-prerelease.2", + "contentHash": "JtOKHJR4DEyq3HxmdEVXIxhqNQnu1KmjGFXuEQrNHoPbzi8Yr9465VKVXdsoAF0Lm8StdyJHQ03efjv3+OlonA==" }, "MonoModReorg.RuntimeDetour": { "type": "Transitive", - "resolved": "22.11.17-prerelease.1", - "contentHash": "gOFDFz88Lr/H5G6pQOejjvyq2lh63jLS8Fmajk0s3bt54BlW4v0pa+b3rI4ZPDOTmGdxAi1yZtREX20j6ewzqQ==", + "resolved": "22.11.21-prerelease.2", + "contentHash": "Qv1h4rW03LrHwxwVuw5R6hbL8X78l8Lfnxe5tMlyVAe+AK0HnwsRzjsTwzFF57wxWUwq12NbLflkzV6T+hIhJw==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoModReorg.Backports": "22.11.17-prerelease.1", - "MonoModReorg.Core": "22.11.17-prerelease.1", - "MonoModReorg.ILHelpers": "22.11.17-prerelease.1", - "MonoModReorg.Utils": "22.11.17-prerelease.1" + "MonoModReorg.Backports": "22.11.21-prerelease.2", + "MonoModReorg.Core": "22.11.21-prerelease.2", + "MonoModReorg.ILHelpers": "22.11.21-prerelease.2", + "MonoModReorg.Utils": "22.11.21-prerelease.2" } }, "MonoModReorg.Utils": { "type": "Transitive", - "resolved": "22.11.17-prerelease.1", - "contentHash": "i/F1vekXLt7jHGWqM05naWIsp5cQ5L3tCP4efcpAT3O/lrtPL6nmL7/9u+FV4Ip/jp5HNKqMHR67CdMWNh9aOA==", + "resolved": "22.11.21-prerelease.2", + "contentHash": "TX+vlgg2/x8rzEOqwiAy2qv61FjlJsr4u10WGTekCkulZVmmC+xxDmK+4Do9noXF/4RlgFN6sR3m9/W8KvJq3g==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoModReorg.Backports": "22.11.17-prerelease.1", - "MonoModReorg.ILHelpers": "22.11.17-prerelease.1" + "MonoModReorg.Backports": "22.11.21-prerelease.2", + "MonoModReorg.ILHelpers": "22.11.21-prerelease.2" } }, "protobuf-net": { @@ -511,11 +511,11 @@ "type": "Project", "dependencies": { "ControlzEx": "[5.0.2, )", - "HarmonyX": "[2.10.2-prerelease, )", + "HarmonyX": "[2.10.2-prerelease.1, )", "MahApps.Metro": "[2.4.9, )", "Microsoft.CodeAnalysis.CSharp": "[4.4.0, )", "Microsoft.CodeAnalysis.Common": "[4.4.0, )", - "MonoModReorg.RuntimeDetour": "[22.11.17-prerelease.1, )", + "MonoModReorg.RuntimeDetour": "[22.11.21-prerelease.2, )", "NLog": "[5.1.0, )", "System.ComponentModel.Annotations": "[5.0.0, )", "Torch.API": "[1.0.0, )", diff --git a/Torch/Patches/ObjectFactoryInitPatch.cs b/Torch/Patches/ObjectFactoryInitPatch.cs index bb38b3d..2c48dd9 100644 --- a/Torch/Patches/ObjectFactoryInitPatch.cs +++ b/Torch/Patches/ObjectFactoryInitPatch.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; using Sandbox; using Sandbox.Game.Entities; using Torch.Utils; @@ -69,6 +66,8 @@ namespace Torch.Patches } } + MyEntities.Orchestrator = new MyParallelEntityUpdateOrchestrator(); + // static MyObjectPoolManager() // Render, so should be fine. } diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj index 298ab53..03db1f2 100644 --- a/Torch/Torch.csproj +++ b/Torch/Torch.csproj @@ -23,12 +23,12 @@ - + - + diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs index a7ec5c2..2608b52 100644 --- a/Torch/VRageGame.cs +++ b/Torch/VRageGame.cs @@ -240,6 +240,7 @@ namespace Torch _log.Info("Services initialized"); MySandboxGame.InitMultithreading(); + MyVRage.Platform.System.OnThreadpoolInitialized(); // MyInitializer.InitCheckSum(); @@ -309,6 +310,7 @@ namespace Torch _getVRagePluginList().Remove(_torch); MyInitializer.InvokeAfterRun(); + MyVRage.Done(); } private void DoStart() diff --git a/Torch/packages.lock.json b/Torch/packages.lock.json index 98bc4df..b51df9f 100644 --- a/Torch/packages.lock.json +++ b/Torch/packages.lock.json @@ -14,11 +14,11 @@ }, "HarmonyX": { "type": "Direct", - "requested": "[2.10.2-prerelease, )", - "resolved": "2.10.2-prerelease", - "contentHash": "a9wXURpkmi5aGTHEQiNCWv9DSKugpQLgT315wC1+zcnuxy5iUqgm7y7seH9IGDsWv7I33o6sGCUcGFAECsKusw==", + "requested": "[2.10.2-prerelease.1, )", + "resolved": "2.10.2-prerelease.1", + "contentHash": "5hbH0ENhQ+JV7tk63fQ2ab7MtplRHKJYH1JfIjG39rlltHNXxAcGJh05an+SQbVRV4EoP/+Qm9w9BrLc3RwRMA==", "dependencies": { - "MonoModReorg.RuntimeDetour": "22.11.17-prerelease.1", + "MonoModReorg.RuntimeDetour": "22.11.21-prerelease.2", "System.Reflection.Emit": "4.7.0", "System.Reflection.Emit.Lightweight": "4.7.0" } @@ -67,15 +67,15 @@ }, "MonoModReorg.RuntimeDetour": { "type": "Direct", - "requested": "[22.11.17-prerelease.1, )", - "resolved": "22.11.17-prerelease.1", - "contentHash": "gOFDFz88Lr/H5G6pQOejjvyq2lh63jLS8Fmajk0s3bt54BlW4v0pa+b3rI4ZPDOTmGdxAi1yZtREX20j6ewzqQ==", + "requested": "[22.11.21-prerelease.2, )", + "resolved": "22.11.21-prerelease.2", + "contentHash": "Qv1h4rW03LrHwxwVuw5R6hbL8X78l8Lfnxe5tMlyVAe+AK0HnwsRzjsTwzFF57wxWUwq12NbLflkzV6T+hIhJw==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoModReorg.Backports": "22.11.17-prerelease.1", - "MonoModReorg.Core": "22.11.17-prerelease.1", - "MonoModReorg.ILHelpers": "22.11.17-prerelease.1", - "MonoModReorg.Utils": "22.11.17-prerelease.1" + "MonoModReorg.Backports": "22.11.21-prerelease.2", + "MonoModReorg.Core": "22.11.21-prerelease.2", + "MonoModReorg.ILHelpers": "22.11.21-prerelease.2", + "MonoModReorg.Utils": "22.11.21-prerelease.2" } }, "NLog": { @@ -159,36 +159,36 @@ }, "MonoModReorg.Backports": { "type": "Transitive", - "resolved": "22.11.17-prerelease.1", - "contentHash": "MZXad6VJQgkFd5d4MqRcBI0EPhSDFlCl590L1rFKBJC2BqZR6DO2ZjAsRNtP8JyomFp+JzDJIqOIR+YgoWkhAg==", + "resolved": "22.11.21-prerelease.2", + "contentHash": "69T6jjA5nx29jLkdqtfXKlJ8sMqIlc6czNDTomy0rbM68W0xo2JRJBgsu2mroBuqx7nvUdX+zIU6k1edS/pPbw==", "dependencies": { - "MonoModReorg.ILHelpers": "22.11.17-prerelease.1" + "MonoModReorg.ILHelpers": "22.11.21-prerelease.2" } }, "MonoModReorg.Core": { "type": "Transitive", - "resolved": "22.11.17-prerelease.1", - "contentHash": "2I3CRne3mAPW+z46/fmallENRCBD6ufa4sZnF7V5FleKFEwSxLkejZQfuvB/Jt4DaHo8b9ktly5UGpgcYpAOIQ==", + "resolved": "22.11.21-prerelease.2", + "contentHash": "gDoxu4aAF6TeOo8rsrj5prq2X36i12ch6NeRHu/Ct0H3qoPDHuEQ6JMJN/Eiy45YrLNEN7C5+Ku4BrNX4nwVQg==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoModReorg.Backports": "22.11.17-prerelease.1", - "MonoModReorg.ILHelpers": "22.11.17-prerelease.1", - "MonoModReorg.Utils": "22.11.17-prerelease.1" + "MonoModReorg.Backports": "22.11.21-prerelease.2", + "MonoModReorg.ILHelpers": "22.11.21-prerelease.2", + "MonoModReorg.Utils": "22.11.21-prerelease.2" } }, "MonoModReorg.ILHelpers": { "type": "Transitive", - "resolved": "22.11.17-prerelease.1", - "contentHash": "waeN4kdsQf2cXnXJd6SpqEfp4p+8kvcftcwijkSpq8I4fPGOagfCKNKRtDo5raRsi6PuCTK+dpljRsSOYQX6vg==" + "resolved": "22.11.21-prerelease.2", + "contentHash": "JtOKHJR4DEyq3HxmdEVXIxhqNQnu1KmjGFXuEQrNHoPbzi8Yr9465VKVXdsoAF0Lm8StdyJHQ03efjv3+OlonA==" }, "MonoModReorg.Utils": { "type": "Transitive", - "resolved": "22.11.17-prerelease.1", - "contentHash": "i/F1vekXLt7jHGWqM05naWIsp5cQ5L3tCP4efcpAT3O/lrtPL6nmL7/9u+FV4Ip/jp5HNKqMHR67CdMWNh9aOA==", + "resolved": "22.11.21-prerelease.2", + "contentHash": "TX+vlgg2/x8rzEOqwiAy2qv61FjlJsr4u10WGTekCkulZVmmC+xxDmK+4Do9noXF/4RlgFN6sR3m9/W8KvJq3g==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoModReorg.Backports": "22.11.17-prerelease.1", - "MonoModReorg.ILHelpers": "22.11.17-prerelease.1" + "MonoModReorg.Backports": "22.11.21-prerelease.2", + "MonoModReorg.ILHelpers": "22.11.21-prerelease.2" } }, "SemanticVersioning": {