Merge pull request #3014 from ZeroK-RTS/master

GoogleFrog · web-flow · commit b291a3edb7a2 · 2025-07-11T16:58:56.000+10:00
Probably need to send the battle status after updating it.
diff --git a/ZkLobbyServer/ServerBattle.cs b/ZkLobbyServer/ServerBattle.cs
@@ -1064,7 +1064,7 @@ public virtual void ValidateBattleStatus(UserBattleStatus ubs)
                 if (ubs.QueueOrder <= 0)
                 {
                     ubs.QueueOrder = ++QueueCounter;
-                    if (IsInPreviousGame(ubs.Name)) ubs.QueueOrder += 1000;
+                    if (IsInPreviousGame(ubs.Name)) ubs.QueueOrder += 100000;
                 }
             }
             else
@@ -1142,6 +1142,7 @@ protected virtual async Task OnDedicatedExited(SpringBattleContext springBattleC
                         {
                             ubs.QueueOrder = -1;
                             ValidateBattleStatus(ubs);
+                            await server.Broadcast(Users.Keys, ubs.ToUpdateBattleStatus());
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1064,7 +1064,7 @@ public virtual void ValidateBattleStatus(UserBattleStatus ubs)`
`1064`	`1064`	`if (ubs.QueueOrder <= 0)`
`1065`	`1065`	`{`
`1066`	`1066`	`ubs.QueueOrder = ++QueueCounter;`
`1067`		`- if (IsInPreviousGame(ubs.Name)) ubs.QueueOrder += 1000;`
	`1067`	`+ if (IsInPreviousGame(ubs.Name)) ubs.QueueOrder += 100000;`
`1068`	`1068`	`}`
`1069`	`1069`	`}`
`1070`	`1070`	`else`
`@@ -1142,6 +1142,7 @@ protected virtual async Task OnDedicatedExited(SpringBattleContext springBattleC`
`1142`	`1142`	`{`
`1143`	`1143`	`ubs.QueueOrder = -1;`
`1144`	`1144`	`ValidateBattleStatus(ubs);`
	`1145`	`+ await server.Broadcast(Users.Keys, ubs.ToUpdateBattleStatus());`
`1145`	`1146`	`}`
`1146`	`1147`	`}`
`1147`	`1148`	`}`