shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-02-02 06:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

Browse source
This commit is contained in:
lempamo 2017-02-26 13:35:39 -05:00
commit ca703e314d
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ShiftOS.Server/SaveManager.cs
View file

@ -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 { }
}
}

4
ShiftOS_TheReturn/Shiftorium.cs
View file

@ -208,7 +208,9 @@ namespace ShiftOS.Engine
}
catch
{
throw new ShiftoriumUpgradeLookupException(id);
return false;
Console.WriteLine("Upgrade " + id + "DNE.");
Console.WriteLine();
}
}