diff options
| author | lempamo <[email protected]> | 2017-02-26 13:35:39 -0500 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-02-26 13:35:39 -0500 |
| commit | ca703e314d596b7c44f83e1a5ca416ded9576673 (patch) | |
| tree | fa199c62451e02ddf8d4e4dc48a8446f8a3ba484 | |
| parent | f765e3ef33129f6a21641f7ccdb667ea157d7eed (diff) | |
| parent | 337d0ac1dd7330238aa7994bbab6b672e5cd2af7 (diff) | |
| download | shiftos_thereturn-ca703e314d596b7c44f83e1a5ca416ded9576673.tar.gz shiftos_thereturn-ca703e314d596b7c44f83e1a5ca416ded9576673.tar.bz2 shiftos_thereturn-ca703e314d596b7c44f83e1a5ca416ded9576673.zip | |
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
| -rw-r--r-- | ShiftOS.Server/SaveManager.cs | 24 | ||||
| -rw-r--r-- | ShiftOS_TheReturn/Shiftorium.cs | 4 |
2 files changed, 19 insertions, 9 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 { } } } 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(); } } |