BETA: Fix for ticket #5627 (It was wrong SkillType).

Code refactoring and cleanup.
Removed redundant check: player.getClan() == null || !player.isClanLeader().

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2ClanMember.java

@@ -368,7 +368,7 @@ public class L2ClanMember
 		L2Clan clan = player.getClan();
 		if (clan != null)
 		{
-			switch (player.getClan().getLevel())
+			switch (clan.getLevel())
 			{
 				case 4:
 					if (player.isClanLeader())

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleMagicianInstance.java

@@ -18,6 +18,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.L2SkillLearn;
@@ -42,8 +43,9 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 	protected static final int COND_ALL_FALSE = 0;
 	protected static final int COND_BUSY_BECAUSE_OF_SIEGE = 1;
 	protected static final int COND_OWNER = 2;
-	
+
 	/**
+	 * @param objectId
 	 * @param template
 	 */
 	public L2CastleMagicianInstance(int objectId, L2NpcTemplate template)
@@ -55,20 +57,26 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 	@Override
 	public void showChatWindow(L2PcInstance player, int val)
 	{
-		player.sendPacket( ActionFailed.STATIC_PACKET );
+		player.sendPacket(ActionFailed.STATIC_PACKET);
 		String filename = "data/html/castlemagician/magician-no.htm";
 		
 		int condition = validateCondition(player);
 		if (condition > COND_ALL_FALSE)
 		{
 			if (condition == COND_BUSY_BECAUSE_OF_SIEGE)
+			{
 				filename = "data/html/castlemagician/magician-busy.htm"; // Busy because of siege
-			else if (condition == COND_OWNER)                                    // Clan owns castle
+			}
+			else if (condition == COND_OWNER) // Clan owns castle
 			{
 				if (val == 0)
+				{
 					filename = "data/html/castlemagician/magician.htm";
+				}
 				else
+				{
 					filename = "data/html/castlemagician/magician-" + val + ".htm";
+				}
 			}
 		}
 		
@@ -88,8 +96,12 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 			{
 				val = Integer.parseInt(command.substring(5));
 			}
-			catch (IndexOutOfBoundsException ioobe){}
-			catch (NumberFormatException nfe){}
+			catch (IndexOutOfBoundsException ioobe)
+			{
+			}
+			catch (NumberFormatException nfe)
+			{
+			}
 			showChatWindow(player, val);
 			return;
 		}
@@ -102,13 +114,21 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 			{
 				int i1 = Rnd.get(100);
 				if (i1 < 5)
+				{
 					item = 9931; // Red Talisman of Meditation
+				}
 				else if (i1 <= 50)
+				{
 					item = 9932; // Blue Talisman - Divine Protection
-				else if( i1 <= 75 )
+				}
+				else if (i1 <= 75)
+				{
 					item = 10416; // Blue Talisman - Explosion
+				}
 				else
+				{
 					item = 10417; // Blue Talisman - Magic Explosion
+				}
 			}
 			else if (i0 <= 15)
 			{
@@ -127,12 +147,12 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 						item = 9929;
 						break;
 					default: // Blue Talisman of Invisibility
-						item = 9920; 
+						item = 9920;
 						
 				}
 			}
-			else if( i0 <= 30 )
-			{	
+			else if (i0 <= 30)
+			{
 				switch (Rnd.get(8))
 				{
 					case 1: // Blue Talisman of Defense
@@ -162,7 +182,7 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 			}
 			else
 			{
-				switch(Rnd.get(46))
+				switch (Rnd.get(46))
 				{
 					case 0: // Blue Talisman of Power
 						item = 9914;
@@ -303,7 +323,7 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 			
 			if (player.destroyItemByItemId("ExchangeKE", 9912, 10, this, false))
 			{
-				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+				final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 				msg.addItemName(9912);
 				msg.addNumber(10);
 				player.sendPacket(msg);
@@ -313,74 +333,90 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 				filename = "data/html/castlemagician/magician-KE-Exchange.htm";
 			}
 			else
+			{
 				filename = "data/html/castlemagician/magician-no-KE.htm";
+			}
 			
 			showChatWindow(player, filename);
-			return;
 		}
 		else if (command.equals("gotoleader"))
 		{
 			if (player.getClan() != null)
 			{
-				L2PcInstance clanLeader = player.getClan().getLeader().getPlayerInstance();
+				final L2PcInstance clanLeader = player.getClan().getLeader().getPlayerInstance();
 				if (clanLeader == null)
+				{
 					return;
+				}
 				
 				if (clanLeader.getFirstEffect(L2EffectType.CLAN_GATE) != null)
 				{
 					if (!validateGateCondition(clanLeader, player))
+					{
 						return;
+					}
 					
 					player.teleToLocation(clanLeader.getX(), clanLeader.getY(), clanLeader.getZ(), false);
 					return;
 				}
-				String filename = "data/html/castlemagician/magician-nogate.htm";
-				showChatWindow(player, filename);
+				showChatWindow(player, "data/html/castlemagician/magician-nogate.htm");
 			}
-			return;
 		}
 		else if (command.equals("subskills"))
 		{
-			if (player.getClan() != null)
+			if (player.isClanLeader())
 			{
-				if (player.isClanLeader())
+				final FastList<L2SkillLearn> skills = SkillTreesData.getInstance().getAvailableSubPledgeSkills(player.getClan());
+				final AcquireSkillList asl = new AcquireSkillList(SkillType.SubPledge);
+				int count = 0;
+				
+				for (L2SkillLearn s : skills)
 				{
-					AcquireSkillList skilllist = new AcquireSkillList(SkillType.SubClass);
-					FastList<L2SkillLearn> list = SkillTreesData.getInstance().getAvailableSubPledgeSkills(player.getClan());
-					if (list.isEmpty())
+					if (SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel()) != null)
 					{
-						player.sendPacket(SystemMessageId.NO_MORE_SKILLS_TO_LEARN);
-						return;
+						asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getLevelUpSp(), 0);
+						++count;
 					}
-					for (L2SkillLearn skillLearn : list)
-					{
-						skilllist.addSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel(), skillLearn.getSkillLevel(), skillLearn.getLevelUpSp(), 0);
-					}
-					player.sendPacket(skilllist);
+				}
+				
+				if (count == 0)
+				{
+					player.sendPacket(SystemMessageId.NO_MORE_SKILLS_TO_LEARN);
 				}
 				else
 				{
-					String filename = "data/html/castlemagician/magician-nosquad.htm";
-					showChatWindow(player, filename);
+					player.sendPacket(asl);
 				}
 			}
+			else
+			{
+				showChatWindow(player, "data/html/castlemagician/magician-nosquad.htm");
+			}
 		}
 		else
+		{
 			super.onBypassFeedback(player, command);
+		}
 	}
 	
 	protected int validateCondition(L2PcInstance player)
 	{
 		if (player.isGM())
+		{
 			return COND_OWNER;
-		if (getCastle() != null && getCastle().getCastleId() > 0)
+		}
+		if ((getCastle() != null) && (getCastle().getCastleId() > 0))
 		{
 			if (player.getClan() != null)
 			{
 				if (getCastle().getZone().isActive())
-					return COND_BUSY_BECAUSE_OF_SIEGE;                   // Busy because of siege
-				else if (getCastle().getOwnerId() == player.getClanId()) // Clan owns castle
+				{
+					return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
+				}
+				else if (getCastle().getOwnerId() == player.getClanId())
+				{
 					return COND_OWNER;
+				}
 			}
 		}
 		return COND_ALL_FALSE;
@@ -390,59 +426,58 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 	{
 		if (clanLeader.isAlikeDead())
 		{
-			// Need retail message if there's one.
+			//TODO: Need retail message if there's one.
 			player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 			return false;
 		}
 		
 		if (clanLeader.isInStoreMode())
 		{
-			// Need retail message if there's one.
+			//TODO: Need retail message if there's one.
 			player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 			return false;
 		}
 		
 		if (clanLeader.isRooted() || clanLeader.isInCombat())
 		{
-			// Need retail message if there's one.
+			//TODO: Need retail message if there's one.
 			player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 			return false;
 		}
 		
 		if (clanLeader.isInOlympiadMode())
 		{
-			// Need retail message if there's one.
+			//TODO: Need retail message if there's one.
 			player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 			return false;
 		}
 		
 		if (clanLeader.isFestivalParticipant())
 		{
-			// Need retail message if there's one.
+			//TODO: Need retail message if there's one.
 			player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 			return false;
 		}
 		
 		if (clanLeader.inObserverMode())
 		{
-			// Need retail message if there's one.
+			//TODO: Need retail message if there's one.
 			player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 			return false;
 		}
 		
 		if (clanLeader.isInsideZone(L2Character.ZONE_NOSUMMONFRIEND))
 		{
-			// Need retail message if there's one.
+			//TODO: Need retail message if there's one.
 			player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 			return false;
 		}
 		
 		if (clanLeader.getInstanceId() > 0)
 		{
-			if (!Config.ALLOW_SUMMON_TO_INSTANCE
-					|| InstanceManager.getInstance().getInstance(player.getInstanceId()).isSummonAllowed())
+			if (!Config.ALLOW_SUMMON_TO_INSTANCE || InstanceManager.getInstance().getInstance(player.getInstanceId()).isSummonAllowed())
 			{
-				// Need retail message if there's one.
+				//TODO: Need retail message if there's one.
 				player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 				return false;
 			}
@@ -455,7 +490,7 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 			{
 				if (targetCabal != SevenSigns.getInstance().getCabalHighestScore())
 				{
-					// Need retail message if there's one.
+					//TODO: Need retail message if there's one.
 					player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 					return false;
 				}
@@ -464,7 +499,7 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 			{
 				if (targetCabal == SevenSigns.CABAL_NULL)
 				{
-					// Need retail message if there's one.
+					//TODO: Need retail message if there's one.
 					player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 					return false;
 				}
@@ -479,20 +514,16 @@ public class L2CastleMagicianInstance extends L2NpcInstance implements L2SquadTr
 		
 		if (!TvTEvent.onEscapeUse(clanLeader.getObjectId()))
 		{
-			// Need retail message if there's one.
+			//TODO: Need retail message if there's one.
 			player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet.");
 			return false;
 		}
-		
 		return true;
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.actor.L2SquadTrainer#showSubUnitSkillList(com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
-	 */
 	@Override
 	public void showSubUnitSkillList(L2PcInstance player)
 	{
 		onBypassFeedback(player, "subskills");
 	}
-}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ClassMasterInstance.java

@@ -106,7 +106,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 		}
 		else if(command.startsWith("increase_clan_level"))
 		{
-			if (player.getClan() == null || !player.isClanLeader())
+			if (!player.isClanLeader())
 			{
 				NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				html.setFile(player.getHtmlPrefix(), "data/html/classmaster/noclanleader.htm");

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortEnvoyInstance.java

@@ -37,7 +37,7 @@ public class L2FortEnvoyInstance extends L2Npc
 		
 		String filename;
 		
-		if (!player.isClanLeader() || player.getClan() == null || getFort().getFortId() != player.getClan().getHasFort())
+		if (!player.isClanLeader() || getFort().getFortId() != player.getClan().getHasFort())
 			filename = "data/html/fortress/envoy-noclan.htm";
 		else if (getFort().getFortState() == 0)
 			filename = "data/html/fortress/envoy.htm";

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java

@@ -67,7 +67,7 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 		}
 		else if (actualCommand.equalsIgnoreCase("rewards"))
 		{
-			if (player.getClan() != null && getFort().getOwnerClan() != null && player.getClan() == getFort().getOwnerClan() && player.isClanLeader())
+			if (player.isClanLeader() && getFort().getOwnerClan() != null && player.getClan() == getFort().getOwnerClan())
 			{
 				NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-rewards.htm");

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2FortSupportCaptainInstance.java

@@ -20,7 +20,6 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.datatables.SkillTreesData;
-import com.l2jserver.gameserver.model.L2Skill;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.L2SquadTrainer;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -42,29 +41,25 @@ public class L2FortSupportCaptainInstance extends L2MerchantInstance implements
 		setInstanceType(InstanceType.L2FortSupportCaptainInstance);
 	}
 	
-	private final static int[] TalismanIds =
-	{
-		9914,9915,9917,9918,9919,9920,9921,9922,9923,9924,
-		9926,9927,9928,9930,9931,9932,9933,9934,9935,9936,
-		9937,9938,9939,9940,9941,9942,9943,9944,9945,9946,
-		9947,9948,9949,9950,9951,9952,9953,9954,9955,9956,
-		9957,9958,9959,9960,9961,9962,9963,9964,9965,9966,
-		10141,10142,10158
-	};
+	private final static int[] TalismanIds = { 9914, 9915, 9917, 9918, 9919, 9920, 9921, 9922, 9923, 9924, 9926, 9927, 9928, 9930, 9931, 9932, 9933, 9934, 9935, 9936, 9937, 9938, 9939, 9940, 9941, 9942, 9943, 9944, 9945, 9946, 9947, 9948, 9949, 9950, 9951, 9952, 9953, 9954, 9955, 9956, 9957, 9958, 9959, 9960, 9961, 9962, 9963, 9964, 9965, 9966, 10141, 10142, 10158 };
 	
 	@Override
 	public void onBypassFeedback(L2PcInstance player, String command)
 	{
 		// BypassValidation Exploit plug.
 		if (player.getLastFolkNPC().getObjectId() != getObjectId())
+		{
 			return;
+		}
 		
 		StringTokenizer st = new StringTokenizer(command, " ");
 		String actualCommand = st.nextToken(); // Get actual command
 		
 		String par = "";
 		if (st.countTokens() >= 1)
+		{
 			par = st.nextToken();
+		}
 		
 		if (actualCommand.equalsIgnoreCase("Chat"))
 		{
@@ -73,9 +68,12 @@ public class L2FortSupportCaptainInstance extends L2MerchantInstance implements
 			{
 				val = Integer.parseInt(par);
 			}
-			catch (IndexOutOfBoundsException ioobe){}
-			catch (NumberFormatException nfe){}
-			
+			catch (IndexOutOfBoundsException ioobe)
+			{
+			}
+			catch (NumberFormatException nfe)
+			{
+			}
 			showMessageWindow(player, val);
 		}
 		else if (actualCommand.equalsIgnoreCase("ExchangeKE"))
@@ -84,74 +82,68 @@ public class L2FortSupportCaptainInstance extends L2MerchantInstance implements
 			
 			if (player.destroyItemByItemId("FortSupportUnit", 9912, 10, this, false))
 			{
-				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+				final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 				msg.addItemName(9912);
 				msg.addNumber(10);
 				player.sendPacket(msg);
 				
 				player.addItem("FortSupportUnit", item, 1, player, true);
 				
-				String filename = "data/html/fortress/supportunit-talisman.htm";
-				showChatWindow(player, filename);
+				showChatWindow(player, "data/html/fortress/supportunit-talisman.htm");
 			}
 			else
 			{
-				String filename = "data/html/fortress/supportunit-noepau.htm";
-				showChatWindow(player, filename);
+				showChatWindow(player, "data/html/fortress/supportunit-noepau.htm");
 			}
 		}
 		else if (command.equals("subskills"))
 		{
-			if (player.getClan() != null)
+			if (player.isClanLeader())
 			{
-				if (player.isClanLeader())
+				final FastList<L2SkillLearn> skills = SkillTreesData.getInstance().getAvailableSubPledgeSkills(player.getClan());
+				final AcquireSkillList asl = new AcquireSkillList(SkillType.SubPledge);
+				int count = 0;
+				
+				for (L2SkillLearn s : skills)
 				{
-					final FastList<L2SkillLearn> skills = SkillTreesData.getInstance().getAvailableSubPledgeSkills(player.getClan());
-					final AcquireSkillList asl = new AcquireSkillList(SkillType.SubPledge);
-					
-					int count = 0;
-					for (L2SkillLearn s: skills)
-					{
-						final L2Skill sk = SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel());
-						if (sk != null)
-						{
-							asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getLevelUpSp(), 0);
-							count++;
-						}
-					}
-					//TODO: Missing some system message?
-					if (count == 0)
-					{
-						player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_MORE_SKILLS_TO_LEARN));
-					}
-					else
+					if (SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel()) != null)
 					{
-						player.sendPacket(asl);
+						asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getLevelUpSp(), 0);
+						count++;
 					}
 				}
+				
+				if (count == 0)
+				{
+					player.sendPacket(SystemMessageId.NO_MORE_SKILLS_TO_LEARN);
+				}
 				else
 				{
-					String filename = "data/html/fortress/supportunit-nosquad.htm";
-					showChatWindow(player, filename);
+					player.sendPacket(asl);
 				}
 			}
+			else
+			{
+				showChatWindow(player, "data/html/fortress/supportunit-nosquad.htm");
+			}
 		}
 		else
+		{
 			super.onBypassFeedback(player, command);
+		}
 	}
 	
 	@Override
 	public void showChatWindow(L2PcInstance player)
 	{
-		if (player.getClan() == null || getFort().getOwnerClan() == null || player.getClan() != getFort().getOwnerClan())
+		if ((player.getClan() == null) || (getFort().getOwnerClan() == null) || (player.getClan() != getFort().getOwnerClan()))
 		{
-			NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 			html.setFile(player.getHtmlPrefix(), "data/html/fortress/supportunit-noclan.htm");
 			html.replace("%objectId%", String.valueOf(getObjectId()));
 			player.sendPacket(html);
 			return;
 		}
-		
 		showMessageWindow(player, 0);
 	}
 	
@@ -160,18 +152,26 @@ public class L2FortSupportCaptainInstance extends L2MerchantInstance implements
 		String filename;
 		
 		if (val == 0)
+		{
 			filename = "data/html/fortress/supportunit.htm";
+		}
 		else
+		{
 			filename = "data/html/fortress/supportunit-" + val + ".htm";
+		}
 		
 		NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 		html.setFile(player.getHtmlPrefix(), filename);
 		html.replace("%objectId%", String.valueOf(getObjectId()));
 		html.replace("%npcId%", String.valueOf(getNpcId()));
 		if (getFort().getOwnerClan() != null)
+		{
 			html.replace("%clanname%", getFort().getOwnerClan().getName());
+		}
 		else
+		{
 			html.replace("%clanname%", "NPC");
+		}
 		player.sendPacket(html);
 	}
 	
@@ -186,4 +186,4 @@ public class L2FortSupportCaptainInstance extends L2MerchantInstance implements
 	{
 		onBypassFeedback(player, "subskills");
 	}
-}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2ManorManagerInstance.java

@@ -43,9 +43,8 @@ public class L2ManorManagerInstance extends L2MerchantInstance
 		if (!player.isGM()
 				&& getCastle() != null
 				&& getCastle().getCastleId() > 0
-				&& player.getClan() != null
-				&& getCastle().getOwnerId() == player.getClanId()
-				&& player.isClanLeader())
+				&& player.isClanLeader()
+				&& getCastle().getOwnerId() == player.getClanId())
 			showChatWindow(player, "data/html/manormanager/manager-lord.htm");
 		else
 			showChatWindow(player, "data/html/manormanager/manager.htm");

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java

@@ -1089,7 +1089,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 	 */
 	public static final void showPledgeSkillList(L2PcInstance player)
 	{
-		if (player.getClan() == null || !player.isClanLeader())
+		if (!player.isClanLeader())
 		{
 			NpcHtmlMessage html = new NpcHtmlMessage(1);
 			html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/NotClanLeader.htm");

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgePower.java

@@ -41,12 +41,13 @@ public final class RequestPledgePower extends L2GameClientPacket
 	@Override
 	protected void runImpl()
 	{
-		L2PcInstance player = getClient().getActiveChar();
-		if (player == null) return;
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null)
+			return;
 		
 		if(_action == 2)
 		{
-			if(player.getClan() != null && player.isClanLeader())
+			if(player.isClanLeader())
 			{
 				if(_rank == 9)
 				{
@@ -64,8 +65,7 @@ public final class RequestPledgePower extends L2GameClientPacket
 			}
 		} else
 		{
-			ManagePledgePower mpp = new ManagePledgePower(getClient().getActiveChar().getClan(), _action, _rank);
-			player.sendPacket(mpp);
+			player.sendPacket(new ManagePledgePower(getClient().getActiveChar().getClan(), _action, _rank));
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSiegeFlag.java

@@ -153,7 +153,7 @@ public class L2SkillSiegeFlag extends L2Skill
 			text = "You can only place a flag during a siege.";
 		else if (castle.getSiege().getAttackerClan(player.getClan()) == null)
 			text = "You must be an attacker to place a flag.";
-		else if (player.getClan() == null || !player.isClanLeader())
+		else if (!player.isClanLeader())
 			text = "You must be a clan leader to place a flag.";
 		else if (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount())
 			text = "You have already placed the maximum number of flags possible.";
@@ -188,7 +188,7 @@ public class L2SkillSiegeFlag extends L2Skill
 			text = "You can only place a flag during a siege.";
 		else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
 			text = "You must be an attacker to place a flag.";
-		else if (player.getClan() == null || !player.isClanLeader())
+		else if (!player.isClanLeader())
 			text = "You must be a clan leader to place a flag.";
 		else if (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= FortSiegeManager.getInstance().getFlagMaxCount())
 			text = "You have already placed the maximum number of flags possible.";
@@ -224,7 +224,7 @@ public class L2SkillSiegeFlag extends L2Skill
 			text = "You must be on fort or castle ground to construct an outpost or flag.";
 		else if ((fort != null && !fort.getZone().isActive()) || (castle != null && !castle.getZone().isActive()))
 			text = "You can only construct an outpost or flag on siege field.";
-		else if (player.getClan() == null || !player.isClanLeader())
+		else if (!player.isClanLeader())
 			text = "You must be a clan leader to construct an outpost or flag.";
 		else if (TerritoryWarManager.getInstance().getHQForClan(player.getClan()) != null && isOutPost)
 			text = "You can have only one outpost.";