Check for clan leader parameter and cleanup.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model.conditions;
 
 import org.l2jmobius.gameserver.model.actor.Creature;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Skill;
 
@@ -44,10 +45,18 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		final PlayerInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getClan() == null))
 		{
 			return false;
 		}
-		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		
+		final boolean isClanLeader = player.isClanLeader();
+		if ((_pledgeClass == -1) && !isClanLeader)
+		{
+			return false;
+		}
+		
+		return isClanLeader || (player.getPledgeClass() >= _pledgeClass);
 	}
 }