PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge branch 'master' of https://github.com/TorchAPI/Torch

Browse Source
This commit is contained in:
John Gross
2019-04-15 15:39:09 -07:00
parent 60c0ae1049 5c8a1f3677
commit 2d7893b9de
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Torch/Managers/NetworkManager/NetworkManager_Deprecated.cs
View File

@@ -68,6 +68,10 @@ namespace Torch.Managers
/// <inheritdoc/> /// <inheritdoc/>
public override void Attach() public override void Attach()
{ {
//disable all this for now
_log.Warn("Network intercept disabled. Some plugins may not work correctly.");
return;
if (_init) if (_init)
return; return;
@@ -362,6 +366,9 @@ namespace Torch.Managers
/// <inheritdoc /> /// <inheritdoc />
public void RegisterNetworkHandler(INetworkHandler handler) 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 handlerType = handler.GetType().FullName;
var toRemove = new List<INetworkHandler>(); var toRemove = new List<INetworkHandler>();
foreach (var item in _networkHandlers) foreach (var item in _networkHandlers)

2
Torch/Patches/TorchAsyncSaving.cs
View File

@@ -66,7 +66,7 @@ namespace Torch.Patches
{ {
if (!Game.IsDedicated && MySession.Static != null) if (!Game.IsDedicated && MySession.Static != null)
ShowWorldSaveResult(tmpSnapshot.SavingSuccess); ShowWorldSaveResult(tmpSnapshot.SavingSuccess);
saveTaskSource.SetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk); saveTaskSource.TrySetResult(tmpSnapshot.SavingSuccess ? GameSaveResult.Success : GameSaveResult.FailedToSaveToDisk);
}); });
}); });
return saveTaskSource.Task; return saveTaskSource.Task;

7
Torch/Utils/StringUtils.cs
View File

@@ -4,7 +4,6 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using VRage.Game;
namespace Torch.Utils namespace Torch.Utils
{ {
@@ -63,10 +62,12 @@ namespace Torch.Utils
return builder?.ToString() ?? ""; 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) public static bool IsFontEnum(string str)
{ {
return _fontEnumValues.Contains(str); return FontEnumValues.Contains(str);
} }
} }
} }