From 50df04eb6f1c120abb8441edc371dbe3225257bb Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 14 Jun 2019 22:13:53 +0200 Subject: [PATCH] mbar seems to be optional --- ClanServer/Controllers/L44/Gameend.cs | 15 ++++++++++----- ClanServer/Startup.cs | 3 +++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ClanServer/Controllers/L44/Gameend.cs b/ClanServer/Controllers/L44/Gameend.cs index a22eab3..18c7f10 100644 --- a/ClanServer/Controllers/L44/Gameend.cs +++ b/ClanServer/Controllers/L44/Gameend.cs @@ -123,8 +123,8 @@ namespace ClanServer.Controllers.L44 ctx.JubeatScores.Add(score); - JubeatHighscore highscore = ctx.JubeatHighscores - .SingleOrDefault(s => s.MusicID == musicId && s.Seq == seq && s.ProfileID == profile.ID); + JubeatHighscore highscore = await ctx.JubeatHighscores + .SingleOrDefaultAsync(s => s.MusicID == musicId && s.Seq == seq && s.ProfileID == profile.ID); if (highscore == null) { @@ -132,7 +132,8 @@ namespace ClanServer.Controllers.L44 { ProfileID = profile.ID, MusicID = musicId, - Seq = seq + Seq = seq, + Bar = score.Bar }; ctx.JubeatHighscores.Add(highscore); @@ -148,8 +149,12 @@ namespace ClanServer.Controllers.L44 highscore.FcCount = int.Parse(tunePlayer.Element("fc_cnt").Value); highscore.ExcCount = int.Parse(tunePlayer.Element("ex_cnt").Value); - mbarStrs = tunePlayer.Element("mbar").Value.Split(' '); - highscore.Bar = Array.ConvertAll(mbarStrs, s => byte.Parse(s)); + XElement mbarE = tunePlayer.Element("mbar"); + if (mbarE != null) + { + mbarStrs = mbarE.Value.Split(' '); + highscore.Bar = Array.ConvertAll(mbarStrs, s => byte.Parse(s)); + } } XElement jubility = playerE.Element("jubility"); diff --git a/ClanServer/Startup.cs b/ClanServer/Startup.cs index 0faa561..a2d0826 100644 --- a/ClanServer/Startup.cs +++ b/ClanServer/Startup.cs @@ -41,7 +41,10 @@ namespace ClanServer .AddDbContext(options => { if (CurEnv.IsDevelopment()) + { options.UseLoggerFactory(LogFactory); + options.EnableSensitiveDataLogging(); + } options.UseSqlite("Data Source=clanserver.db"); });