From a05cebba57403f326ec868378fc15053e62948eb Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Sun, 26 Feb 2017 18:09:59 +0000 Subject: [PATCH 1/2] more fixes --- ShiftOS.Server/SaveManager.cs | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/ShiftOS.Server/SaveManager.cs b/ShiftOS.Server/SaveManager.cs index 58634d1..cef8b37 100644 --- a/ShiftOS.Server/SaveManager.cs +++ b/ShiftOS.Server/SaveManager.cs @@ -85,19 +85,27 @@ namespace ShiftOS.Server } catch { } } - Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage + try { - Name = "mud_login_denied", - GUID = "server" - })); + Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage + { + Name = "mud_login_denied", + GUID = "server" + })); + } + catch { } } else { - Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage + try { - Name = "mud_login_denied", - GUID = "server" - })); + Program.server.DispatchTo(new Guid(guid), new NetObject("auth_failed", new ServerMessage + { + Name = "mud_login_denied", + GUID = "server" + })); + } + catch { } } } From 337d0ac1dd7330238aa7994bbab6b672e5cd2af7 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 26 Feb 2017 11:14:44 -0700 Subject: [PATCH 2/2] shiftorium does not need to have a exception as a result you can now create new saves --- ShiftOS_TheReturn/Shiftorium.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ShiftOS_TheReturn/Shiftorium.cs b/ShiftOS_TheReturn/Shiftorium.cs index b91e421..e6fc299 100644 --- a/ShiftOS_TheReturn/Shiftorium.cs +++ b/ShiftOS_TheReturn/Shiftorium.cs @@ -208,7 +208,9 @@ namespace ShiftOS.Engine } catch { - throw new ShiftoriumUpgradeLookupException(id); + return false; + Console.WriteLine("Upgrade " + id + "DNE."); + Console.WriteLine(); } }