From 38a749f24fb5abc1ccb50056cd146b6973064039 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 25 Feb 2020 18:34:30 +0000
Subject: [PATCH] Consider clan leader as top pledge class.

---
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 6 +++++-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 6 +++++-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 .../model/conditions/ConditionPlayerPledgeClass.java        | 2 +-
 17 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index db16b1e13a..a4b2931d06 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -44,6 +44,10 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getClan() != null) && ((_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass));
+		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		{
+			return false;
+		}
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index db16b1e13a..a4b2931d06 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -44,6 +44,10 @@ public class ConditionPlayerPledgeClass extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
 	{
-		return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getClan() != null) && ((_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass));
+		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
+		{
+			return false;
+		}
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
index 1043c1845f..a4b2931d06 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
 		{
 			return false;
 		}
-		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+		return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
 	}
 }