diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java index c5df3e338b..a9609a4662 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java @@ -51,7 +51,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket } if (player.getObjectId() != clan.getLeaderId()) { - player.sendMessage("You do not have enough privilages to take this action."); + player.sendMessage("You do not have enough privileges to take this action."); return; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java index 4b3140d707..3e66551174 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java @@ -55,7 +55,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket } if (player.getObjectId() != clan.getLeaderId()) { - player.sendMessage("You do not have enough privilages to take this action."); + player.sendMessage("You do not have enough privileges to take this action."); return; } @@ -67,7 +67,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket } // Check if it can be learned. - if (clan.getTotalDevelopmentPoints() < (clan.getUsedDevelopmentPoints() + 1)) + if (clan.getTotalDevelopmentPoints() <= clan.getUsedDevelopmentPoints()) { player.sendMessage("Your clan develpment points are not sufficient."); return; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index 9b0ef31c14..60fb36919e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -63,19 +63,18 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { available = false; } - if (clan.getReputationScore() < mastery.getClanReputation()) + else { - available = false; - } - final int previous = mastery.getPreviousMastery(); - final int previousAlt = mastery.getPreviousMasteryAlt(); - if (previousAlt > 0) - { - available = clan.hasMastery(previous) || clan.hasMastery(previousAlt); - } - else if (previous > 0) - { - available = clan.hasMastery(previous); + final int previous = mastery.getPreviousMastery(); + final int previousAlt = mastery.getPreviousMasteryAlt(); + if (previousAlt > 0) + { + available = clan.hasMastery(previous) || clan.hasMastery(previousAlt); + } + else if (previous > 0) + { + available = clan.hasMastery(previous); + } } packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. diff --git a/L2J_Mobius_5.0_Salvation/readme.txt b/L2J_Mobius_5.0_Salvation/readme.txt index 5994086576..1f87bc6b7b 100644 --- a/L2J_Mobius_5.0_Salvation/readme.txt +++ b/L2J_Mobius_5.0_Salvation/readme.txt @@ -87,6 +87,7 @@ Grand Crusade: Salvation: -Parsed new items from client -New Agathion item support +-New clan system support Events: -Birth of Draco diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java index c5df3e338b..a9609a4662 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java @@ -51,7 +51,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket } if (player.getObjectId() != clan.getLeaderId()) { - player.sendMessage("You do not have enough privilages to take this action."); + player.sendMessage("You do not have enough privileges to take this action."); return; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java index 4b3140d707..3e66551174 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java @@ -55,7 +55,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket } if (player.getObjectId() != clan.getLeaderId()) { - player.sendMessage("You do not have enough privilages to take this action."); + player.sendMessage("You do not have enough privileges to take this action."); return; } @@ -67,7 +67,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket } // Check if it can be learned. - if (clan.getTotalDevelopmentPoints() < (clan.getUsedDevelopmentPoints() + 1)) + if (clan.getTotalDevelopmentPoints() <= clan.getUsedDevelopmentPoints()) { player.sendMessage("Your clan develpment points are not sufficient."); return; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index 9b0ef31c14..60fb36919e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -63,19 +63,18 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { available = false; } - if (clan.getReputationScore() < mastery.getClanReputation()) + else { - available = false; - } - final int previous = mastery.getPreviousMastery(); - final int previousAlt = mastery.getPreviousMasteryAlt(); - if (previousAlt > 0) - { - available = clan.hasMastery(previous) || clan.hasMastery(previousAlt); - } - else if (previous > 0) - { - available = clan.hasMastery(previous); + final int previous = mastery.getPreviousMastery(); + final int previousAlt = mastery.getPreviousMasteryAlt(); + if (previousAlt > 0) + { + available = clan.hasMastery(previous) || clan.hasMastery(previousAlt); + } + else if (previous > 0) + { + available = clan.hasMastery(previous); + } } packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. diff --git a/L2J_Mobius_5.5_EtinasFate/readme.txt b/L2J_Mobius_5.5_EtinasFate/readme.txt index 99ee228748..b74d849fbe 100644 --- a/L2J_Mobius_5.5_EtinasFate/readme.txt +++ b/L2J_Mobius_5.5_EtinasFate/readme.txt @@ -86,6 +86,7 @@ Grand Crusade: Salvation: -New Agathion item support +-New clan system support Etina's Fate: -Parsed new items from client diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java index c5df3e338b..a9609a4662 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasteryReset.java @@ -51,7 +51,7 @@ public class RequestExPledgeMasteryReset implements IClientIncomingPacket } if (player.getObjectId() != clan.getLeaderId()) { - player.sendMessage("You do not have enough privilages to take this action."); + player.sendMessage("You do not have enough privileges to take this action."); return; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java index 4b3140d707..3e66551174 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMasterySet.java @@ -55,7 +55,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket } if (player.getObjectId() != clan.getLeaderId()) { - player.sendMessage("You do not have enough privilages to take this action."); + player.sendMessage("You do not have enough privileges to take this action."); return; } @@ -67,7 +67,7 @@ public class RequestExPledgeMasterySet implements IClientIncomingPacket } // Check if it can be learned. - if (clan.getTotalDevelopmentPoints() < (clan.getUsedDevelopmentPoints() + 1)) + if (clan.getTotalDevelopmentPoints() <= clan.getUsedDevelopmentPoints()) { player.sendMessage("Your clan develpment points are not sufficient."); return; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index 9b0ef31c14..60fb36919e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -63,19 +63,18 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { available = false; } - if (clan.getReputationScore() < mastery.getClanReputation()) + else { - available = false; - } - final int previous = mastery.getPreviousMastery(); - final int previousAlt = mastery.getPreviousMasteryAlt(); - if (previousAlt > 0) - { - available = clan.hasMastery(previous) || clan.hasMastery(previousAlt); - } - else if (previous > 0) - { - available = clan.hasMastery(previous); + final int previous = mastery.getPreviousMastery(); + final int previousAlt = mastery.getPreviousMasteryAlt(); + if (previousAlt > 0) + { + available = clan.hasMastery(previous) || clan.hasMastery(previousAlt); + } + else if (previous > 0) + { + available = clan.hasMastery(previous); + } } packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. diff --git a/L2J_Mobius_6.0_Fafurion/readme.txt b/L2J_Mobius_6.0_Fafurion/readme.txt index 43082bf774..93f914578e 100644 --- a/L2J_Mobius_6.0_Fafurion/readme.txt +++ b/L2J_Mobius_6.0_Fafurion/readme.txt @@ -86,6 +86,7 @@ Grand Crusade: Salvation: -New Agathion item support +-New clan system support Etina's Fate: -Parsed new items from client