diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index d1cd1153fa..b50464fca2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -296,34 +296,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index d1cd1153fa..b50464fca2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -296,34 +296,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
index c8bd53d071..87e34401e9 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
@@ -299,34 +299,27 @@ public class FortSiegeManager
 	
 	public boolean checkIfCanPickup(PlayerInstance player)
 	{
-		final SystemMessage sm = new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
-		sm.addItemName(9819);
-		// Cannot own 2 combat flag
 		if (player.isCombatFlagEquipped())
 		{
-			player.sendPacket(sm);
+			return false;
+		}
+		if (!player.isClanLeader())
+		{
+			player.sendMessage("The flag can only be picked up by a clan leader.");
 			return false;
 		}
 		
-		// here check if is siege is in progress
-		// here check if is siege is attacker
 		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((fort == null) || (fort.getResidenceId() <= 0) || (fort.getSiege().getAttackerClan(player.getClan()) == null))
+		{
+			return false;
+		}
+		if (!fort.getSiege().isInProgress())
+		{
+			player.sendPacket(new SystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED).addItemName(9819));
+			return false;
+		}
 		
-		if ((fort == null) || (fort.getResidenceId() <= 0))
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (!fort.getSiege().isInProgress())
-		{
-			player.sendPacket(sm);
-			return false;
-		}
-		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
-		{
-			player.sendPacket(sm);
-			return false;
-		}
 		return true;
 	}