try to improve !predict

Author: DeinFreund

ZkLobbyServer/ServerBattle.cs

@@ -330,6 +330,7 @@ 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

@@ -39,13 +39,32 @@ public override async Task ExecuteArmed(ServerBattle battle, Say e)
             using (var db = new ZkDataContext())
             {
                 if (battle.IsInGame)
+                {
                     teams = b.spring.LobbyStartContext?.Players.Where(u => !u.IsSpectator)
                         .GroupBy(u => u.AllyID)
                         .Select(x => x.Select(p => Account.AccountByName(db, p.Name))).ToList();
+                }
                 else
-                    teams = b.Users.Values.Where(u => !u.IsSpectator)
-                        .GroupBy(u => u.AllyNumber)
-                        .Select(x => x.Select(p => Account.AccountByName(db, p.Name))).ToList();
+                {
+                    switch (battle.Mode)
+                    {
+                        case PlasmaShared.AutohostMode.Game1v1:
+                            teams = b.Users.Values.Where(u => !u.IsSpectator)
+                                .GroupBy(u => u.Name)
+                                .Select(x => x.Select(p => Account.AccountByName(db, p.Name))).ToList();
+                            break;
+
+                        case PlasmaShared.AutohostMode.Teams:
+                            await battle.Respond(e, $"The battle will be balanced when it starts");
+                            return;
+
+                        default:
+                            teams = b.Users.Values.Where(u => !u.IsSpectator)
+                                .GroupBy(u => u.AllyNumber)
+                                .Select(x => x.Select(p => Account.AccountByName(db, p.Name))).ToList();
+                            break;
+                    }
+                }
 
                 if (teams.Count < 2)
                 {