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 removeFriends = new ArrayList<>(); for (Map.Entry 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 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 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;