From 93470b21a4953f40262c275b7df7fb08697d0b2d Mon Sep 17 00:00:00 2001
From: qmengz <554318064@qq.com>
Date: Wed, 12 Nov 2025 05:37:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20SetTeam=20=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=AD=E7=9A=84=E5=86=85=E5=AE=B9=20Id=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=B9=B6=E4=BC=98=E5=8C=96=E5=93=8D=E5=BA=94=E5=9B=A2?=
 =?UTF-8?q?=E9=98=9F=E6=95=B0=E6=8D=AE=E7=9A=84=E6=B7=BB=E5=8A=A0=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=20(#65)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed ContentsId handling in the SetTeam logic and optimized the way response team data is added.
---
 EpinelPS/LobbyServer/Team/SetTeam.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/EpinelPS/LobbyServer/Team/SetTeam.cs b/EpinelPS/LobbyServer/Team/SetTeam.cs
index d7a3021..80a9354 100644
--- a/EpinelPS/LobbyServer/Team/SetTeam.cs
+++ b/EpinelPS/LobbyServer/Team/SetTeam.cs
@@ -1,4 +1,5 @@
-using EpinelPS.Database;
+using EpinelPS.Data;
+using EpinelPS.Database;
 using EpinelPS.Utils;
 
 namespace EpinelPS.LobbyServer.Team
@@ -16,10 +17,16 @@ namespace EpinelPS.LobbyServer.Team
             {
                 Type = req.Type
             };
-            response.Teams.AddRange(req.Teams.ToArray());
+            response.Teams.AddRange([.. req.Teams]);
 
             // Add team data to user data
-            NetUserTeamData teamData = new() { LastContentsTeamNumber = req.ContentsId + 1, Type = req.Type };
+            int contentsId = req.ContentsId + 1; // Default to 1 if not provided
+            if (req.Type == (int)TeamType.StoryEvent)
+            {
+                contentsId = 1; // Default to 1 for story event teams
+            }
+
+            NetUserTeamData teamData = new() { LastContentsTeamNumber = contentsId, Type = req.Type };
 
             // Check for existing teams with same TeamNumber and replace or add accordingly
             foreach (var newTeam in req.Teams)
@@ -47,7 +54,7 @@ namespace EpinelPS.LobbyServer.Team
             {
                 // If key already exists, we need to merge teams properly
                 var existingTeamData = user.UserTeams[req.Type];
-                existingTeamData.LastContentsTeamNumber = req.ContentsId + 1;
+                existingTeamData.LastContentsTeamNumber = contentsId;
                 existingTeamData.Type = req.Type;
 
                 // Apply same logic to existing team data