Fix ambiguous reference resolution

This commit is contained in:
John Gross
2017-08-21 20:15:16 -07:00
parent f48f23c2eb
commit e9476a59e8

View File

@@ -30,7 +30,6 @@ using VRage.Library;
using VRage.ObjectBuilders;
using VRage.Plugins;
using VRage.Utils;
using ThreadState = System.Threading.ThreadState;
#pragma warning disable 618
@@ -184,7 +183,7 @@ namespace Torch.Server
if (!mre.WaitOne(TimeSpan.FromSeconds(Instance.Config.TickTimeout)))
{
var mainThread = MySandboxGame.Static.UpdateThread;
if (mainThread.ThreadState == ThreadState.Running)
if (mainThread.ThreadState == System.Threading.ThreadState.Running)
mainThread.Suspend();
var stackTrace = new StackTrace(mainThread, true);
throw new TimeoutException($"Server watchdog detected that the server was frozen for at least {((TorchServer)state).Config.TickTimeout} seconds.\n{stackTrace}");