diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
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 cd218284aa..c4c5337351 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
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
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 cd218284aa..c4c5337351 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
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
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 cd218284aa..c4c5337351 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
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index cd218284aa..c4c5337351 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index cd218284aa..c4c5337351 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index cd218284aa..c4c5337351 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
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 cd218284aa..c4c5337351 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
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index cd218284aa..c4c5337351 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index cd218284aa..c4c5337351 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
index bf648a8572..901acc075d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -71,15 +71,24 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 		}
 		else
 		{
-			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge))
+			if (!((requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge) || (requestor.getRequest().getRequestPacket() instanceof RequestClanAskJoinByName)))
 			{
 				return; // hax
 			}
 			
-			final RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			final int pledgeType;
+			if (requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)
+			{
+				pledgeType = ((RequestJoinPledge) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			else
+			{
+				pledgeType = ((RequestClanAskJoinByName) requestor.getRequest().getRequestPacket()).getPledgeType();
+			}
+			
 			final L2Clan clan = requestor.getClan();
 			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
-			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType()))
+			if (clan.checkClanJoinCondition(requestor, activeChar, pledgeType))
 			{
 				if (activeChar.getClan() != null)
 				{
@@ -88,8 +97,8 @@ public final class RequestAnswerJoinPledge implements IClientIncomingPacket
 				
 				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
 				
-				activeChar.setPledgeType(requestPacket.getPledgeType());
-				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+				activeChar.setPledgeType(pledgeType);
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
 				{
 					activeChar.setPowerGrade(9); // academy
 					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
index cd218284aa..c4c5337351 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
@@ -59,4 +59,9 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
 		
 		invitedPlayer.sendPacket(new AskJoinPledge(activeChar, _pledgeType, activeChar.getClan().getName()));
 	}
+	
+	public int getPledgeType()
+	{
+		return _pledgeType;
+	}
 }
\ No newline at end of file