From af9a31f4ad0d4f560526eee2fea2400563d7194e Mon Sep 17 00:00:00 2001 From: Brant Martin Date: Tue, 9 Apr 2019 21:20:56 -0400 Subject: [PATCH 1/3] Keen broke network intercept. Disable it until we decide what to do. --- Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs b/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs index 5bfa3cc..1c2c580 100644 --- a/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs +++ b/Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs @@ -68,6 +68,10 @@ namespace Torch.Managers /// public override void Attach() { + //disable all this for now + _log.Warn("Network intercept disabled. Some plugins may not work correctly."); + return; + if (_init) return; @@ -362,6 +366,9 @@ namespace Torch.Managers /// public void RegisterNetworkHandler(INetworkHandler handler) { + _log.Warn($"Plugin {handler.GetType().Assembly.FullName} registered a network handler. This system no longer works. Please alert the plugin author."); + return; + var handlerType = handler.GetType().FullName; var toRemove = new List(); foreach (var item in _networkHandlers) From b37cd74e56d53721d8ea8f7dc80a8a66933d2883 Mon Sep 17 00:00:00 2001 From: Brant Martin Date: Wed, 10 Apr 2019 14:28:13 -0400 Subject: [PATCH 2/3] Fix gross initializer error on first time installations --- Torch/Utils/StringUtils.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Torch/Utils/StringUtils.cs b/Torch/Utils/StringUtils.cs index 167807a..2177009 100644 --- a/Torch/Utils/StringUtils.cs +++ b/Torch/Utils/StringUtils.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using VRage.Game; namespace Torch.Utils { @@ -63,10 +62,12 @@ namespace Torch.Utils return builder?.ToString() ?? ""; } - private static readonly string[] _fontEnumValues = typeof(MyFontEnum).GetFields(BindingFlags.Public | BindingFlags.Static).Where(x => x.IsLiteral && !x.IsInitOnly).Select(x => (string)x.GetValue(null)).ToArray(); + private static string[] FontEnumValues => _fontEnumValues ?? (_fontEnumValues = typeof(VRage.Game.MyFontEnum).GetFields(BindingFlags.Public | BindingFlags.Static).Where(x => x.IsLiteral && !x.IsInitOnly).Select(x => (string)x.GetValue(null)).ToArray()); + + private static string[] _fontEnumValues; public static bool IsFontEnum(string str) { - return _fontEnumValues.Contains(str); + return FontEnumValues.Contains(str); } } } From 5c8a1f36771243b12fd0dc8c47266ea52071de1c Mon Sep 17 00:00:00 2001 From: Brant Martin Date: Wed, 10 Apr 2019 16:29:41 -0400 Subject: [PATCH 3/3] Don't throw exceptions when saving is abnormal --- Torch/Patches/TorchAsyncSaving.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Torch/Patches/TorchAsyncSaving.cs b/Torch/Patches/TorchAsyncSaving.cs index c20c59d..3c99e77 100644 --- a/Torch/Patches/TorchAsyncSaving.cs +++ b/Torch/Patches/TorchAsyncSaving.cs @@ -66,7 +66,7 @@ namespace Torch.Patches { if (!Game.IsDedicated && MySession.Static != null) ShowWorldSaveResult(tmpSnapshot.SavingSuccess); - saveTaskSource.SetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk); + saveTaskSource.TrySetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk); }); }); return saveTaskSource.Task;