Fixed player join clan with penalty from clan entry application.

Contributed by Enryu.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_CANNOT_JOIN_THE_CLAN_BECAUSE_ONE_DAY_HAS_NOT_YET_PASSED_SINCE_THEY_LEFT_ANOTHER_CLAN);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,62 +55,78 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,63 +55,79 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					player.setClanJoinTime(currentTime);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				player.setClanJoinTime(System.currentTimeMillis());
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,63 +55,79 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					player.setClanJoinTime(currentTime);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				player.setClanJoinTime(System.currentTimeMillis());
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java

@@ -41,14 +41,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 {
 	private boolean _acceptRequest;
 	private int _playerId;
-	private int _clanId;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
 		_acceptRequest = packet.readD() == 1;
 		_playerId = packet.readD();
-		_clanId = packet.readD();
+		packet.readD(); // Clan Id.
 		return true;
 	}
 	
@@ -56,63 +55,79 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
 	public void run(GameClient client)
 	{
 		final Player player = client.getPlayer();
-		if ((player == null) || (player.getClan() == null))
+		if (player == null)
 		{
 			return;
 		}
 		
+		final Clan clan = player.getClan();
+		if (clan == null)
+		{
+			return;
+		}
+		
+		final int clanId = clan.getId();
 		if (_acceptRequest)
 		{
 			final Player target = World.getInstance().getPlayer(_playerId);
-			final Clan clan = player.getClan();
+			if (target != null)
-			if ((target != null) && (target.getClan() == null) && (clan != null))
 			{
-				target.sendPacket(new JoinPledge(clan.getId()));
+				final long currentTime = System.currentTimeMillis();
-				
+				if ((target.getClan() == null) && (target.getClanJoinExpiryTime() < currentTime))
-				// player.setPowerGrade(9); // academy
-				target.setPowerGrade(5); // New member starts at 5, not confirmed.
-				clan.addClanMember(target);
-				target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
-				target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
-				
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
-				sm.addString(target.getName());
-				clan.broadcastToOnlineMembers(sm);
-				
-				if (clan.getCastleId() > 0)
 				{
-					final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+					target.sendPacket(new JoinPledge(clan.getId()));
-					if (castle != null)
+					
+					// player.setPowerGrade(9); // academy
+					target.setPowerGrade(5); // New member starts at 5, not confirmed.
+					clan.addClanMember(target);
+					target.setClanPrivileges(target.getClan().getRankPrivs(target.getPowerGrade()));
+					target.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+					
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_JOINED_THE_CLAN);
+					sm.addString(target.getName());
+					clan.broadcastToOnlineMembers(sm);
+					
+					if (clan.getCastleId() > 0)
 					{
-						castle.giveResidentialSkills(target);
+						final Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+						if (castle != null)
+						{
+							castle.giveResidentialSkills(target);
+						}
 					}
+					if (clan.getFortId() > 0)
+					{
+						final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+						if (fort != null)
+						{
+							fort.giveResidentialSkills(target);
+						}
+					}
+					target.sendSkillList();
+					
+					clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
+					clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+					clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
+					
+					// This activates the clan tab on the new member.
+					PledgeShowMemberListAll.sendAllTo(target);
+					target.setClanJoinExpiryTime(0);
+					player.setClanJoinTime(currentTime);
+					target.broadcastUserInfo();
+					
+					ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 				}
-				if (clan.getFortId() > 0)
+				else if (target.getClanJoinExpiryTime() > currentTime)
 				{
-					final Fort fort = FortManager.getInstance().getFortByOwner(clan);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.C1_WILL_BE_ABLE_TO_JOIN_YOUR_CLAN_IN_24_H_AFTER_LEAVING_THE_PREVIOUS_ONE);
-					if (fort != null)
+					sm.addString(target.getName());
-					{
+					player.sendPacket(sm);
-						fort.giveResidentialSkills(target);
-					}
 				}
-				target.sendSkillList();
-				
-				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(target), target);
-				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
-				clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
-				
-				// This activates the clan tab on the new member.
-				PledgeShowMemberListAll.sendAllTo(target);
-				target.setClanJoinExpiryTime(0);
-				player.setClanJoinTime(System.currentTimeMillis());
-				target.broadcastUserInfo();
-				
-				ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
 			}
 		}
 		else
 		{
-			ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
+			ClanEntryManager.getInstance().removePlayerApplication(clanId, _playerId);
 		}
 	}
 }