From 1393504763918832918becb8f67b580cd41310c5 Mon Sep 17 00:00:00 2001
From: grimm <1769111741@qq.com>
Date: Fri, 2 May 2025 23:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A5=BD=E5=8F=8B=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E8=B5=A0=E9=80=81=E4=BD=93=E5=8A=9B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jieling/logic/friend/FriendLogic.java     | 20 +++++++++----------
 .../logic/rank/rankImpl/NewHeroForceRank.java |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
index e68ebca..33874d9 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
@@ -793,16 +793,16 @@ public class FriendLogic {
         List<Integer> removeFriends = new ArrayList<>();
         for (Map.Entry<Integer,Integer> entry: giveMap.entrySet()){
             Integer friendId = entry.getKey();
-            User friendUser = UserManager.getUser(friendId, true);
-            if (friendUser == null) {
-                removeFriends.add(friendId);
-                continue;
-            }
-            FriendManager friendManager1 = friendUser.getFriendManager();
-            Map<Integer, Integer> haveRewardMap = friendManager1.getHaveRewardMap();
-            if (haveRewardMap.containsKey(uid)){
-                friendManager1.updateHaveRewardMap(uid,0);
-            }
+//            User friendUser = UserManager.getUser(friendId, true);
+//            if (friendUser == null) {
+//                removeFriends.add(friendId);
+//                continue;
+//            }
+//            FriendManager friendManager1 = friendUser.getFriendManager();
+//            Map<Integer, Integer> haveRewardMap = friendManager1.getHaveRewardMap();
+//            if (haveRewardMap.containsKey(uid)){
+//                friendManager1.updateHaveRewardMap(uid,0);
+//            }
             friendManager.updateGiveMap(friendId,0);
         }
         //如果用户不在此服务器
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/NewHeroForceRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/NewHeroForceRank.java
index 894b1eb..179f6ba 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/NewHeroForceRank.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/NewHeroForceRank.java
@@ -76,6 +76,7 @@ public class NewHeroForceRank extends AbstractRank {
                 LOGGER.error("uid:{},heroId:{}, hero is null, error!!!!",user.getId(),maxForceHero);
                 return;
             }
+
             int area = user.getPlayerInfoManager().getArea();
             int myRank;
             Double zSetScore;