From 00c2cac6eca17c16ed50d5fe165f6e709aa4c82d Mon Sep 17 00:00:00 2001
From: "DESKTOP-98AVA47\\Administrator" <490717040@qq.com>
Date: Sat, 8 Jan 2022 00:10:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=97=E6=B5=AE=E4=BA=89=E9=94=8B=EF=BC=8C?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=B7=A8=E6=9C=8D=E6=8E=92=E8=A1=8C=E6=A6=9C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=97=AE=E9=A2=98=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
index 22fafbac3..9ad52e12f 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
@@ -995,8 +995,7 @@ public class ArenaLogic {
         int proudTime = get==null?1:Integer.parseInt((String)get);
         String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
 
-        CrossArenaManager data = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer);
-        Integer force = data.getTotalForceByTeam().getOrDefault(TeamEnum.WORLD_TEAM_ARENA_DEFENSE.getTeamId(), 0);
+        int force = (int)CrossServiceLogic.getCrossTeamForce(csPlayer.getUserId(), TeamEnum.WORLD_TEAM_ARENA_DEFENSE.getTeamId());
 
         CommonProto.ArenaPersonInfo personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder()
                 .setUid(csPlayer.getUserId())