From 624ab250ade255c65cc3981dafca6873a3f75efc Mon Sep 17 00:00:00 2001
From: neckfire <neckfire@nfteam.ovh>
Date: Fri, 7 Aug 2026 00:34:32 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20du=20fix=20map=20(squad=20solo=20faisa?=
 =?UTF-8?q?it=20'attente=20d'autres=20joueurs')=20=E2=80=94=20retour=20?=
 =?UTF-8?q?=C3=A0=20l'=C3=A9tat=20jouable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../CloudScript/Functions/TryGetCompleteSquadInfo.cs | 12 +++++++-----
 .../Services/Squad/SquadService.cs                   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Prospect.Server.Api/Services/CloudScript/Functions/TryGetCompleteSquadInfo.cs b/src/Prospect.Server.Api/Services/CloudScript/Functions/TryGetCompleteSquadInfo.cs
index 4103827..2f8b508 100644
--- a/src/Prospect.Server.Api/Services/CloudScript/Functions/TryGetCompleteSquadInfo.cs
+++ b/src/Prospect.Server.Api/Services/CloudScript/Functions/TryGetCompleteSquadInfo.cs
@@ -71,11 +71,13 @@ public class TryGetCompleteSquadInfoFunction : ICloudScriptFunction<TryGetComple
             throw new CloudScriptException("CloudScript was not called within a http request");
         }
         var userId = context.User.FindAuthUserId();
-        var squad = _squadService.GetByUser(userId)
-            // Solo : on matérialise un squad d'un membre (soi-même) pour renvoyer la
-            // liste des cartes débloquées, sinon le client n'en voit aucune et déploie
-            // toujours sur la 1re map.
-            ?? _squadService.JoinOrCreate(userId, userId, "");
+        var squad = _squadService.GetByUser(userId);
+        if (squad == null)
+        {
+            // Solo : pas de squad → squad vide (NE PAS matérialiser un squad, sinon le
+            // client passe en matchmaking de groupe et « attend d'autres joueurs »).
+            return Task.FromResult(new FYPlayFabSquad());
+        }
         _logger.LogInformation("TryGetCompleteSquadInfo: user {User} in squad {Squad} ({Count} member(s))", userId, squad.SquadId, squad.Members.Count);
         return Task.FromResult(_squadService.ToClientSquad(squad));
     }
diff --git a/src/Prospect.Server.Api/Services/Squad/SquadService.cs b/src/Prospect.Server.Api/Services/Squad/SquadService.cs
index 50fdbb4..f866610 100644
--- a/src/Prospect.Server.Api/Services/Squad/SquadService.cs
+++ b/src/Prospect.Server.Api/Services/Squad/SquadService.cs
@@ -97,7 +97,7 @@ public class SquadService
                     selectedMapName = m.SelectedMap,
                     isSecretLeader = m.IsLeader,
                 },
-                mapRowNamesUnlocked = AllMapRows,
+                mapRowNamesUnlocked = Array.Empty<string>(),
             }).ToArray(),
         };
     }