From 5f7eb1c75cee186f2102452fb61d4986dcbe0323 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 23 May 2022 22:13:52 +0000
Subject: [PATCH] Changed party window packet send order.

---
 .../org/l2jmobius/gameserver/model/Party.java | 19 ++++++++-----------
 .../org/l2jmobius/gameserver/model/Party.java | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Party.java
index 2571b99ad8..e0748c5dd5 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Party.java
@@ -350,23 +350,20 @@ public class Party
 			return;
 		}
 		
-		// sends new member party window for all members
-		player.sendPacket(new PartySmallWindowAll(player, this));
-		SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_JOINED_S1_S_PARTY);
-		msg.addString(getLeader().getName());
-		player.sendPacket(msg);
-		
-		msg = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_PARTY);
+		SystemMessage msg = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_PARTY);
 		msg.addString(player.getName());
 		broadcastToPartyMembers(msg);
 		broadcastToPartyMembers(new PartySmallWindowAdd(player, this));
-		for (Player member : _members)
-		{
-			player.sendPacket(new PartySmallWindowAdd(member, this));
-		}
 		
 		// add player to party, adjust party level
 		_members.add(player);
+		
+		// sends new member party window for all members
+		player.sendPacket(new PartySmallWindowAll(player, this));
+		msg = new SystemMessage(SystemMessageId.YOU_HAVE_JOINED_S1_S_PARTY);
+		msg.addString(getLeader().getName());
+		player.sendPacket(msg);
+		
 		if (player.getLevel() > _partyLvl)
 		{
 			_partyLvl = player.getLevel();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java
index 6d704b26d7..868db5df46 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java
@@ -351,23 +351,20 @@ public class Party
 			return;
 		}
 		
-		// sends new member party window for all members
-		player.sendPacket(new PartySmallWindowAll(player, this));
-		SystemMessage msg = new SystemMessage(SystemMessageId.YOU_HAVE_JOINED_S1_S_PARTY);
-		msg.addString(getLeader().getName());
-		player.sendPacket(msg);
-		
-		msg = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_PARTY);
+		SystemMessage msg = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_PARTY);
 		msg.addString(player.getName());
 		broadcastToPartyMembers(msg);
 		broadcastToPartyMembers(new PartySmallWindowAdd(player, this));
-		for (Player member : _members)
-		{
-			player.sendPacket(new PartySmallWindowAdd(member, this));
-		}
 		
 		// add player to party, adjust party level
 		_members.add(player);
+		
+		// sends new member party window for all members
+		player.sendPacket(new PartySmallWindowAll(player, this));
+		msg = new SystemMessage(SystemMessageId.YOU_HAVE_JOINED_S1_S_PARTY);
+		msg.addString(getLeader().getName());
+		player.sendPacket(msg);
+		
 		if (player.getLevel() > _partyLvl)
 		{
 			_partyLvl = player.getLevel();