aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed EF error, edit commands, fix faction broadcast

Browse Source
This commit is contained in:
hydrant
2018-09-23 15:59:40 +02:00
parent 4631f4bb75
commit bba0f7206c
6 changed files with 82 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Server/Extensions/ClientExtension.cs
View File

@@ -21,9 +21,9 @@ namespace reallife_gamemode.Server.Extensions
{
if(context == null)
{
using (DatabaseContext dbContext = new DatabaseContext())
using (context = new DatabaseContext())
{
return dbContext.Users.FirstOrDefault(u => u.Name == client.Name);
return context.Users.FirstOrDefault(u => u.Name == client.Name);
}
}
else
@@ -36,14 +36,18 @@ namespace reallife_gamemode.Server.Extensions
{
if(context == null)
{
using (DatabaseContext dbContext = new DatabaseContext())
using(context = new DatabaseContext())
{
return dbContext.Factions.Find(client.GetUser(context).Faction);
User u = client.GetUser();
if (u == null) return null;
return context.Factions.FirstOrDefault(f => f.Id == u.FactionId);
}
}
else
{
return context.Factions.Find(client.GetUser(context).Faction);
User u = client.GetUser();
if (u == null) return null;
return context.Factions.FirstOrDefault(f => f.Id == u.FactionId);
}
}
}