fix whr change -> db

Author: DeinFreund

ZkData/Ef/WHR/WholeHistoryRating.cs

@@ -202,6 +202,7 @@ public void UpdateRatings()
                     //Trace.TraceInformation("No WHR " + category +" ratings to update");
                     return;
                 }
+                var lastUpdateEx = lastUpdate;
                 Task.Factory.StartNew(() =>
                 {
                     try
@@ -213,15 +214,12 @@ public void UpdateRatings()
                             updateAction.Invoke();
                             Trace.TraceInformation("WHR " + category +" Ratings updated in " + DateTime.Now.Subtract(start).TotalSeconds + " seconds, " + (GC.GetTotalMemory(false) / (1 << 20)) + "MiB total memory allocated");
                             runningInitialization = false;
-
-                            if (!latestBattle.Equals(lastUpdate))
+                            
+                            using (var db = new ZkDataContext())
                             {
-                                using (var db = new ZkDataContext())
-                                {
-                                    db.SpringBattlePlayers.Where(p => p.SpringBattleID == latestBattle.SpringBattleID && !p.IsSpectator && playerOldRatings.ContainsKey(p.AccountID)).ForEach(p => p.EloChange = playerRatings[p.AccountID].RealElo - playerOldRatings[p.AccountID].RealElo);
-                                    db.SpringBattlePlayers.Where(p => p.SpringBattleID == latestBattle.SpringBattleID && !p.IsSpectator).ForEach(x => playerOldRatings[x.AccountID] = playerRatings[x.AccountID]);
-                                    db.SaveChanges();
-                                }
+                                db.SpringBattlePlayers.Where(p => p.SpringBattleID == latestBattle.SpringBattleID && !p.IsSpectator).ToList().Where(p => playerOldRatings.ContainsKey(p.AccountID) && !p.EloChange.HasValue).ForEach(p => p.EloChange = playerRatings[p.AccountID].RealElo - playerOldRatings[p.AccountID].RealElo);
+                                db.SpringBattlePlayers.Where(p => p.SpringBattleID == latestBattle.SpringBattleID && !p.IsSpectator).ForEach(x => playerOldRatings[x.AccountID] = playerRatings[x.AccountID]);
+                                db.SaveChanges();
                             }
                         }
                     }

ZkLobbyServer/ServerBattle.cs

@@ -330,7 +330,6 @@ public async Task SayBattle(string text, string privateUser = null)
                 foreach (var line in text.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries))
                 {
                     if ((privateUser == null) && (spring?.IsRunning == true)) spring.SayGame(line);
-                    if ((privateUser != null) && (spring?.IsRunning == true)) spring.SayGame(Format("/w {0} {1}", privateUser, line));
                     await
                         server.GhostSay(
                             new Say()

ZkLobbyServer/autohost/Commands/CmdPredict.cs

@@ -55,7 +55,7 @@ public override async Task ExecuteArmed(ServerBattle battle, Say e)
                             break;
 
                         case PlasmaShared.AutohostMode.Teams:
-                            await battle.Respond(e, $"The battle will be balanced when it starts");
+                            await battle.SayBattle($"The battle will be balanced when it starts");
                             return;
 
                         default:
@@ -68,14 +68,14 @@ public override async Task ExecuteArmed(ServerBattle battle, Say e)
 
                 if (teams.Count < 2)
                 {
-                    await battle.Respond(e, $"!predict needs at least two human teams to work");
+                    await battle.SayBattle($"!predict needs at least two human teams to work");
                     return;
                 }
 
                 var chances = RatingSystems.GetRatingSystem(cat).PredictOutcome(teams);
                 for (int i = 0; i < teams.Count; i++)
                 {
-                    await battle.Respond(e, $"Team {teams[i].First().Name} has a {Math.Round(1000 * chances[i]) / 10}% chance to win");
+                    await battle.SayBattle( $"Team {teams[i].First().Name} has a {Math.Round(1000 * chances[i]) / 10}% chance to win");
                 }
             }
         }