From 5f8301af7012203bdeae091ae6d5c86d3cf1f3f7 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 30 Sep 2017 15:27:18 +0000
Subject: [PATCH] Add name to ask join pledge.

---
 .../clientpackets/RequestClanAskJoinByName.java       |  2 +-
 .../network/clientpackets/RequestJoinPledge.java      |  2 +-
 .../network/serverpackets/AskJoinPledge.java          | 11 +++++++----
 .../clientpackets/RequestClanAskJoinByName.java       |  2 +-
 .../network/clientpackets/RequestJoinPledge.java      |  2 +-
 .../network/serverpackets/AskJoinPledge.java          | 11 +++++++----
 .../clientpackets/RequestClanAskJoinByName.java       |  2 +-
 .../network/clientpackets/RequestJoinPledge.java      |  2 +-
 .../network/serverpackets/AskJoinPledge.java          | 11 +++++++----
 .../clientpackets/RequestClanAskJoinByName.java       |  2 +-
 .../network/clientpackets/RequestJoinPledge.java      |  2 +-
 .../network/serverpackets/AskJoinPledge.java          | 11 +++++++----
 12 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index 859e3b1947..9b4211403a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -57,6 +57,6 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 			return;
 		}
 		
-		invitedPlayer.sendPacket(new AskJoinPledge(activeChar.getObjectId(), activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
+		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
index 4b8ea6a868..51066c4b3d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
@@ -75,7 +75,7 @@ public final class RequestJoinPledge implements IClientIncomingPacket
 		
 		final String pledgeName = activeChar.getClan().getName();
 		final String subPledgeName = (activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null);
-		target.sendPacket(new AskJoinPledge(activeChar.getObjectId(), subPledgeName, _pledgeType, pledgeName));
+		target.sendPacket(new AskJoinPledge(activeChar, subPledgeName, _pledgeType, pledgeName));
 	}
 	
 	public int getPledgeType()
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
index 76395bdf2c..8da89da0bc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
@@ -17,18 +17,19 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class AskJoinPledge implements IClientOutgoingPacket
 {
-	private final int _requestorObjId;
+	private final L2PcInstance _requestor;
 	private final String _subPledgeName;
 	private final int _pledgeType;
 	private final String _pledgeName;
 	
-	public AskJoinPledge(int requestorObjId, String subPledgeName, int pledgeType, String pledgeName)
+	public AskJoinPledge(L2PcInstance requestor, String subPledgeName, int pledgeType, String pledgeName)
 	{
-		_requestorObjId = requestorObjId;
+		_requestor = requestor;
 		_subPledgeName = subPledgeName;
 		_pledgeType = pledgeType;
 		_pledgeName = pledgeName;
@@ -39,7 +40,9 @@ public final class AskJoinPledge implements IClientOutgoingPacket
 	{
 		OutgoingPackets.ASK_JOIN_PLEDGE.writeId(packet);
 		
-		packet.writeD(_requestorObjId);
+		packet.writeD(_requestor.getObjectId());
+		packet.writeS(_requestor.getName());
+		
 		if (_subPledgeName != null)
 		{
 			packet.writeS(_pledgeType > 0 ? _subPledgeName : _pledgeName);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index 859e3b1947..9b4211403a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -57,6 +57,6 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 			return;
 		}
 		
-		invitedPlayer.sendPacket(new AskJoinPledge(activeChar.getObjectId(), activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
+		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
index 4b8ea6a868..51066c4b3d 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
@@ -75,7 +75,7 @@ public final class RequestJoinPledge implements IClientIncomingPacket
 		
 		final String pledgeName = activeChar.getClan().getName();
 		final String subPledgeName = (activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null);
-		target.sendPacket(new AskJoinPledge(activeChar.getObjectId(), subPledgeName, _pledgeType, pledgeName));
+		target.sendPacket(new AskJoinPledge(activeChar, subPledgeName, _pledgeType, pledgeName));
 	}
 	
 	public int getPledgeType()
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
index 76395bdf2c..8da89da0bc 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
@@ -17,18 +17,19 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class AskJoinPledge implements IClientOutgoingPacket
 {
-	private final int _requestorObjId;
+	private final L2PcInstance _requestor;
 	private final String _subPledgeName;
 	private final int _pledgeType;
 	private final String _pledgeName;
 	
-	public AskJoinPledge(int requestorObjId, String subPledgeName, int pledgeType, String pledgeName)
+	public AskJoinPledge(L2PcInstance requestor, String subPledgeName, int pledgeType, String pledgeName)
 	{
-		_requestorObjId = requestorObjId;
+		_requestor = requestor;
 		_subPledgeName = subPledgeName;
 		_pledgeType = pledgeType;
 		_pledgeName = pledgeName;
@@ -39,7 +40,9 @@ public final class AskJoinPledge implements IClientOutgoingPacket
 	{
 		OutgoingPackets.ASK_JOIN_PLEDGE.writeId(packet);
 		
-		packet.writeD(_requestorObjId);
+		packet.writeD(_requestor.getObjectId());
+		packet.writeS(_requestor.getName());
+		
 		if (_subPledgeName != null)
 		{
 			packet.writeS(_pledgeType > 0 ? _subPledgeName : _pledgeName);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index 859e3b1947..9b4211403a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -57,6 +57,6 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 			return;
 		}
 		
-		invitedPlayer.sendPacket(new AskJoinPledge(activeChar.getObjectId(), activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
+		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
index 4b8ea6a868..51066c4b3d 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
@@ -75,7 +75,7 @@ public final class RequestJoinPledge implements IClientIncomingPacket
 		
 		final String pledgeName = activeChar.getClan().getName();
 		final String subPledgeName = (activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null);
-		target.sendPacket(new AskJoinPledge(activeChar.getObjectId(), subPledgeName, _pledgeType, pledgeName));
+		target.sendPacket(new AskJoinPledge(activeChar, subPledgeName, _pledgeType, pledgeName));
 	}
 	
 	public int getPledgeType()
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
index 76395bdf2c..8da89da0bc 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
@@ -17,18 +17,19 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class AskJoinPledge implements IClientOutgoingPacket
 {
-	private final int _requestorObjId;
+	private final L2PcInstance _requestor;
 	private final String _subPledgeName;
 	private final int _pledgeType;
 	private final String _pledgeName;
 	
-	public AskJoinPledge(int requestorObjId, String subPledgeName, int pledgeType, String pledgeName)
+	public AskJoinPledge(L2PcInstance requestor, String subPledgeName, int pledgeType, String pledgeName)
 	{
-		_requestorObjId = requestorObjId;
+		_requestor = requestor;
 		_subPledgeName = subPledgeName;
 		_pledgeType = pledgeType;
 		_pledgeName = pledgeName;
@@ -39,7 +40,9 @@ public final class AskJoinPledge implements IClientOutgoingPacket
 	{
 		OutgoingPackets.ASK_JOIN_PLEDGE.writeId(packet);
 		
-		packet.writeD(_requestorObjId);
+		packet.writeD(_requestor.getObjectId());
+		packet.writeS(_requestor.getName());
+		
 		if (_subPledgeName != null)
 		{
 			packet.writeS(_pledgeType > 0 ? _subPledgeName : _pledgeName);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index 859e3b1947..9b4211403a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -57,6 +57,6 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 			return;
 		}
 		
-		invitedPlayer.sendPacket(new AskJoinPledge(activeChar.getObjectId(), activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
+		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
index 4b8ea6a868..51066c4b3d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
@@ -75,7 +75,7 @@ public final class RequestJoinPledge implements IClientIncomingPacket
 		
 		final String pledgeName = activeChar.getClan().getName();
 		final String subPledgeName = (activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null);
-		target.sendPacket(new AskJoinPledge(activeChar.getObjectId(), subPledgeName, _pledgeType, pledgeName));
+		target.sendPacket(new AskJoinPledge(activeChar, subPledgeName, _pledgeType, pledgeName));
 	}
 	
 	public int getPledgeType()
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
index 76395bdf2c..8da89da0bc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
@@ -17,18 +17,19 @@
 package com.l2jmobius.gameserver.network.serverpackets;
 
 import com.l2jmobius.commons.network.PacketWriter;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.OutgoingPackets;
 
 public final class AskJoinPledge implements IClientOutgoingPacket
 {
-	private final int _requestorObjId;
+	private final L2PcInstance _requestor;
 	private final String _subPledgeName;
 	private final int _pledgeType;
 	private final String _pledgeName;
 	
-	public AskJoinPledge(int requestorObjId, String subPledgeName, int pledgeType, String pledgeName)
+	public AskJoinPledge(L2PcInstance requestor, String subPledgeName, int pledgeType, String pledgeName)
 	{
-		_requestorObjId = requestorObjId;
+		_requestor = requestor;
 		_subPledgeName = subPledgeName;
 		_pledgeType = pledgeType;
 		_pledgeName = pledgeName;
@@ -39,7 +40,9 @@ public final class AskJoinPledge implements IClientOutgoingPacket
 	{
 		OutgoingPackets.ASK_JOIN_PLEDGE.writeId(packet);
 		
-		packet.writeD(_requestorObjId);
+		packet.writeD(_requestor.getObjectId());
+		packet.writeS(_requestor.getName());
+		
 		if (_subPledgeName != null)
 		{
 			packet.writeS(_pledgeType > 0 ? _subPledgeName : _pledgeName);