lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consider clan leader as top pledge class.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-02-25 18:34:30 +00:00
parent ba799c053a
commit 38a749f24f
17 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -44,6 +44,10 @@ public class ConditionPlayerPledgeClass extends Condition
@Override @Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item) 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);
} }
} }

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

@@ -44,6 +44,10 @@ public class ConditionPlayerPledgeClass extends Condition
@Override @Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item) 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);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

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

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
View File

@@ -48,6 +48,6 @@ public class ConditionPlayerPledgeClass extends Condition
{ {
return false; return false;
} }
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); return effector.getActingPlayer().isClanLeader() || (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
} }
} }