From 7d3cb441d023b66b6dc853ce0fe6814a74623475 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 3 Mar 2023 10:57:03 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E5=AE=88=E5=9F=8E?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=98=B2=E9=94=81=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/gvg/gvgBattleService.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game-server/app/services/gvg/gvgBattleService.ts b/game-server/app/services/gvg/gvgBattleService.ts
index 6b1a83042..b4ac76173 100644
--- a/game-server/app/services/gvg/gvgBattleService.ts
+++ b/game-server/app/services/gvg/gvgBattleService.ts
@@ -560,8 +560,9 @@ export async function calCityGuard(configId: number) {
 
     for(let [groupKey, cities] of sortCities) {
         let cityResult: number[] = [];
+        let index = 0;    // 防死循环，万一出什么事cityResult.length一直不等于cities.length
 
-        while(cityResult.length != cities.length) {
+        while(cityResult.length != cities.length && (++index < 1000)) {
             let sorted = cities
                 .filter(city => cityResult.indexOf(city.cityId) == -1)
                 .sort((a, b) => {