From b35bfe0d1e2a155abcaeef4414a4c6aa43cc4b88 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 31 Oct 2019 10:45:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E7=94=B3=E8=AF=B7=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E5=90=8C=E6=84=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/friend/FriendLogic.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 f80adbfa1..0ab2419fa 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 @@ -309,9 +309,12 @@ public class FriendLogic { int uid = iSession.getUid(); User user = UserManager.getUser(uid); FriendManager friendManager = user.getFriendManager(); - User friendUser = UserManager.getUser(friendId); - FriendManager friendfriendManager = friendUser.getFriendManager(); - + User friendUser = null; + FriendManager friendfriendManager = null; + if(friendId!=0){ + UserManager.getUser(friendId); + friendfriendManager = friendUser.getFriendManager(); + } List friends = friendManager.getFriends(); List applyFriends = friendManager.getApplyFriends(); int maxFriends = SSpecialConfig.getIntegerValue(SSpecialConfig.FRIENDAMOUNT_LIMIT); @@ -403,6 +406,7 @@ public class FriendLogic { friendManager.setApplyFriends(new CopyOnWriteArrayList<>()); friendfriendManager.addFriendId(uid); friendManager.addFriendId(applyfriendId); + UserManager.getUser(applyfriendId).getFriendManager().delMyApplyFriend(uid); initFriendGriveAndRreward(applyfriendId, uid, friendManager, friendfriendManager); sendFriendInfoIndication(uid,applyfriendId,2); nums++;