Merge pull request #3028 from ZeroK-RTS/master

update stable

Author: Licho1

ZkData/Ef/WHR/RatingSystems.cs

@@ -37,15 +37,13 @@ public static void Init()
                         {
                             int battles = 0;
                             data.Database.CommandTimeout = 240;
-                            for (int month = 10*12; month > 0; month--)
+                            for (int month = 5*12; month > 0; month--)
                             {
                                 DateTime minStartTime = DateTime.Now.AddMonths(-month);
                                 DateTime maxStartTime = DateTime.Now.AddMonths(-month + 1);
                                 foreach (SpringBattle b in data.SpringBattles
                                         .Where(x => x.StartTime > minStartTime && x.StartTime < maxStartTime)
-                                        .Include(x => x.ResourceByMapResourceID)
                                         .Include(x => x.SpringBattlePlayers)
-                                        .Include(x => x.SpringBattleBots)
                                         .AsNoTracking()
                                         .OrderBy(x => x.StartTime))
                                 {

ZkLobbyServer/ServerBattle.cs

@@ -1341,7 +1341,7 @@ private void spring_BattleStarted(object sender, SpringBattleContext e)
             try
             {
                 StopVote();
-                if (IsMatchMakerBattle && e.PlayersUnreadyOnStart.Count > 0 && e.IsTimeoutForceStarted)
+                if (IsMatchMakerBattle && Mode != AutohostMode.Planetwars && e.PlayersUnreadyOnStart.Count > 0 && e.IsTimeoutForceStarted)
                 {
                     string message = string.Format("Players {0} did not choose a start position. Game will be aborted.", e.PlayersUnreadyOnStart.StringJoin());
                     spring.SayGame(message);

ZkLobbyServer/SpringieInterface/PlanetWarsMatchMaker.cs

@@ -332,7 +332,7 @@ private async Task JoinPlanetAttack(int targetPlanetId, string userName)
 
                                 await conus.SendCommand(new PwJoinPlanetSuccess() { PlanetID = targetPlanetId });
 
-                                if (attackOption.Attackers.Count == attackOption.TeamSize) await StartChallenge(attackOption);
+                                if (attackOption.Attackers.Count >= attackOption.TeamSize) await StartChallenge(attackOption);
                                 else await UpdateLobby();
                             }
                         }
@@ -361,7 +361,7 @@ private async Task JoinPlanetDefense(int targetPlanetID, string userName)
 
                             await conus.SendCommand(new PwJoinPlanetSuccess() { PlanetID = targetPlanetID });
 
-                            if (Challenge.Defenders.Count == Challenge.TeamSize) await AcceptChallenge();
+                            if (Challenge.Defenders.Count >= Challenge.TeamSize) await AcceptChallenge();
                             else await UpdateLobby();
                         }
                 }