From d8f053335e5b7bf94f704641dfeb139e0b7f3514 Mon Sep 17 00:00:00 2001
From: jiahuiwen <jiahuiwen@qq.com>
Date: Tue, 26 Oct 2021 15:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E5=A4=A7=E6=88=98?=
 =?UTF-8?q?=E5=8A=9B=E5=85=BC=E5=AE=B9=E6=9C=BA=E5=99=A8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
index 3fc72b9a6..c403d6142 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
@@ -3178,6 +3178,9 @@ public class HeroLogic {
 
     ///获取最高战斗力
     public long calTeamForce(User user, int teamId) {
+        if (user == null) {
+            return 100;
+        }
         return user.getPlayerInfoManager().getMaxForce();
         //之前是当前编队战斗力
         /*long teamForce = 0;