From d4682081cda722f55ea771a09b9196be4b54db20 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 14 Jan 2022 22:07:14 +0000
Subject: [PATCH] Fixed friend related issues. Contributed by Strelook66.

---
 .../l2jmobius/gameserver/model/actor/Player.java   |  4 ++--
 .../network/serverpackets/AskJoinFriend.java       | 14 +-------------
 .../l2jmobius/gameserver/model/actor/Player.java   |  4 ++--
 .../network/serverpackets/AskJoinFriend.java       | 14 +-------------
 4 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
index 377d5bc1a5..02c34f8576 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -11828,7 +11828,7 @@ public class Player extends Playable
 		
 		revalidateZone(true);
 		
-		notifyFriends(false);
+		notifyFriends(true);
 		
 		// Fix against exploit on anti-target on login
 		decayMe();
@@ -13086,7 +13086,7 @@ public class Player extends Playable
 			_chanceSkills = null;
 		}
 		
-		notifyFriends(true);
+		notifyFriends(false);
 		
 		// Remove WorldObject object from _allObjects of World
 		World.getInstance().removeObject(this);
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinFriend.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinFriend.java
index 4b22887647..d449188a3c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinFriend.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinFriend.java
@@ -19,25 +19,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
-/**
- * sample
- * <p>
- * 7d c1 b2 e0 4a 00 00 00 00
- * <p>
- * format cdd
- * @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public class AskJoinFriend implements IClientOutgoingPacket
 {
 	private final String _requestorName;
 	
-	/**
-	 * @param requestorName
-	 */
 	public AskJoinFriend(String requestorName)
 	{
 		_requestorName = requestorName;
-		// _itemDistribution = itemDistribution;
 	}
 	
 	@Override
@@ -46,6 +34,6 @@ public class AskJoinFriend implements IClientOutgoingPacket
 		OutgoingPackets.ASK_JOIN_FRIEND.writeId(packet);
 		packet.writeS(_requestorName);
 		packet.writeD(0);
-		return false;
+		return true;
 	}
 }
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
index 119a55a309..320aa59976 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -12132,7 +12132,7 @@ public class Player extends Playable
 		
 		revalidateZone(true);
 		
-		notifyFriends(false);
+		notifyFriends(true);
 		
 		// Fix against exploit on anti-target on login
 		decayMe();
@@ -13403,7 +13403,7 @@ public class Player extends Playable
 			_chanceSkills = null;
 		}
 		
-		notifyFriends(true);
+		notifyFriends(false);
 		
 		// Remove WorldObject object from _allObjects of World
 		World.getInstance().removeObject(this);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinFriend.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinFriend.java
index 4b22887647..d449188a3c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinFriend.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinFriend.java
@@ -19,25 +19,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 
-/**
- * sample
- * <p>
- * 7d c1 b2 e0 4a 00 00 00 00
- * <p>
- * format cdd
- * @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public class AskJoinFriend implements IClientOutgoingPacket
 {
 	private final String _requestorName;
 	
-	/**
-	 * @param requestorName
-	 */
 	public AskJoinFriend(String requestorName)
 	{
 		_requestorName = requestorName;
-		// _itemDistribution = itemDistribution;
 	}
 	
 	@Override
@@ -46,6 +34,6 @@ public class AskJoinFriend implements IClientOutgoingPacket
 		OutgoingPackets.ASK_JOIN_FRIEND.writeId(packet);
 		packet.writeS(_requestorName);
 		packet.writeD(0);
-		return false;
+		return true;
 	}
 }