Update few checks using new methods

L2J_DataPack/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java

@@ -140,7 +140,7 @@ public final class CastleAmbassador extends AbstractNpcAI
 		final int fortOwner = fortresss.getOwnerClan() == null ? 0 : fortresss.getOwnerClan().getId();
 		String htmltext = null;
 		
-		if (player.isClanLeader() && (player.getClan() != null) && (player.getClanId() == fortOwner))
+		if (player.isClanLeader() && (player.getClanId() == fortOwner))
 		{
 			htmltext = (fortresss.isBorderFortress()) ? "ambassador-01.html" : "ambassador.html";
 		}

L2J_DataPack/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java

@@ -19,7 +19,6 @@
 package ai.npc.NpcBuffers;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -133,32 +132,27 @@ public class NpcBufferAI implements Runnable
 				return true;
 			}
 			
-			if (player.isInParty() && targetPlayer.isInParty())
+			if (player.isInPartyWith(targetPlayer))
 			{
-				final L2Party party = player.getParty();
-				
-				if (party.containsPlayer(targetPlayer))
-				{
-					return true;
-				}
-				
-				if (party.isInCommandChannel() && party.getCommandChannel().containsPlayer(targetPlayer))
-				{
-					return true;
-				}
+				return true;
+			}
+			
+			if (player.isInCommandChannelWith(targetPlayer))
+			{
+				return true;
 			}
 			
-			if ((player.getClanId() > 0) && (player.getClanId() == targetPlayer.getClanId()))
+			if (player.isInClanWith(targetPlayer))
 			{
 				return true;
 			}
 			
-			if ((player.getAllyId() > 0) && (player.getAllyId() == targetPlayer.getAllyId()))
+			if (player.isInAllyWith(targetPlayer))
 			{
 				return true;
 			}
 			
-			if ((player.getSiegeState() > 0) && player.isInsideZone(ZoneId.SIEGE) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
+			if (player.isOnSameSiegeSideWith(targetPlayer))
 			{
 				return true;
 			}
@@ -205,7 +199,7 @@ public class NpcBufferAI implements Runnable
 					return true;
 				}
 				
-				if ((player.getClan() != null) && (targetPlayer.getClan() != null) && player.getClan().isAtWarWith(targetPlayer.getClan()))
+				if (player.isAtWarWith(targetPlayer))
 				{
 					return true;
 				}

L2J_DataPack/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java

@@ -124,30 +124,34 @@ public final class WyvernManager extends AbstractNpcAI
 	
 	private boolean isOwnerClan(L2Npc npc, L2PcInstance player)
 	{
+		if (!player.isClanLeader())
+		{
+			return false;
+		}
 		switch (MANAGERS.get(npc.getId()))
 		{
 			case CASTLE:
 			{
-				if ((player.getClan() != null) && (npc.getCastle() != null))
+				if (npc.getCastle() != null)
 				{
-					return (player.isClanLeader() && (player.getClanId() == npc.getCastle().getOwnerId()));
+					return player.getClanId() == npc.getCastle().getOwnerId();
 				}
 				return false;
 			}
 			case CLAN_HALL:
 			{
-				if ((player.getClan() != null) && (npc.getConquerableHall() != null))
+				if (npc.getConquerableHall() != null)
 				{
-					return (player.isClanLeader() && (player.getClanId() == npc.getConquerableHall().getOwnerId()));
+					return player.getClanId() == npc.getConquerableHall().getOwnerId();
 				}
 				return false;
 			}
 			case FORT:
 			{
 				final Fort fort = npc.getFort();
-				if ((player.getClan() != null) && (fort != null) && (fort.getOwnerClan() != null))
+				if ((fort != null) && (fort.getOwnerClan() != null))
 				{
-					return (player.isClanLeader() && (player.getClanId() == npc.getFort().getOwnerClan().getId()));
+					return player.getClanId() == npc.getFort().getOwnerClan().getId();
 				}
 				return false;
 			}

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/Detection.java

@@ -52,25 +52,21 @@ public final class Detection extends AbstractEffect
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
 		final L2PcInstance target = info.getEffected().getActingPlayer();
-		final boolean hasParty = player.isInParty();
-		final boolean hasClan = player.getClanId() > 0;
-		final boolean hasAlly = player.getAllyId() > 0;
 		
 		if (target.isInvisible())
 		{
-			if (hasParty && (target.isInParty()) && (player.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId()))
+			if (player.isInPartyWith(target))
 			{
 				return;
 			}
-			else if (hasClan && (player.getClanId() == target.getClanId()))
+			if (player.isInClanWith(target))
 			{
 				return;
 			}
-			else if (hasAlly && (player.getAllyId() == target.getAllyId()))
+			if (player.isInAllyWith(target))
 			{
 				return;
 			}
-			
 			// Remove Hide.
 			target.getEffectList().stopSkillEffects(true, AbnormalType.HIDE);
 		}

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java

@@ -58,7 +58,7 @@ public final class HeadquarterCreate extends AbstractEffect
 	public void onStart(BuffInfo info)
 	{
 		final L2PcInstance player = info.getEffector().getActingPlayer();
-		if ((player.getClan() == null) || (player.getClan().getLeaderId() != player.getObjectId()))
+		if (!player.isClanLeader())
 		{
 			return;
 		}

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java

@@ -50,7 +50,7 @@ public final class OutpostCreate extends AbstractEffect
 	public void onStart(BuffInfo info)
 	{
 		final L2PcInstance player = info.getEffector().getActingPlayer();
-		if ((player.getClan() == null) || (player.getClan().getLeaderId() != player.getObjectId()))
+		if (!player.isClanLeader())
 		{
 			return;
 		}

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java

@@ -47,7 +47,7 @@ public final class OutpostDestroy extends AbstractEffect
 	public void onStart(BuffInfo info)
 	{
 		final L2PcInstance player = info.getEffector().getActingPlayer();
-		if ((player.getClan() == null) || (player.getClan().getLeaderId() != player.getObjectId()))
+		if (!player.isClanLeader())
 		{
 			return;
 		}

L2J_DataPack/dist/game/data/scripts/handlers/effecthandlers/TakeTerritoryFlag.java

@@ -50,7 +50,7 @@ public final class TakeTerritoryFlag extends AbstractEffect
 	public void onStart(BuffInfo info)
 	{
 		final L2PcInstance player = info.getEffector().getActingPlayer();
-		if ((player.getClan() == null) || (player.getClan().getLeaderId() != player.getObjectId()))
+		if (!player.isClanLeader())
 		{
 			return;
 		}