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

Fixed same clan member becoming leader of more than one subpledge.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2019-11-15 15:17:40 +00:00
parent 3a7f20ca39
commit e762af719d
13 changed files with 91 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -424,7 +424,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -539,7 +540,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -553,11 +556,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -424,7 +424,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -539,7 +540,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -553,11 +556,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -424,7 +424,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -539,7 +540,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -553,11 +556,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -424,7 +424,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -539,7 +540,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -553,11 +556,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -1161,7 +1161,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1277,7 +1278,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1291,11 +1294,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -1161,7 +1161,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1277,7 +1278,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1291,11 +1294,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));

12
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@ -1145,7 +1145,8 @@ public class VillageMasterInstance extends NpcInstance
if (pledgeType != Clan.SUBUNIT_ACADEMY) if (pledgeType != Clan.SUBUNIT_ACADEMY)
{ {
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (pledgeType >= Clan.SUBUNIT_KNIGHT1) if (pledgeType >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1260,7 +1261,9 @@ public class VillageMasterInstance extends NpcInstance
player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID); player.sendPacket(SystemMessageId.CLAN_NAME_IS_INVALID);
return; return;
} }
if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0))
final ClanMember member = clan.getClanMember(leaderName);
if ((member == null) || (member.getPledgeType() != 0) || (clan.getLeaderSubPledge(member.getObjectId()) > 0))
{ {
if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1) if (subPledge.getId() >= Clan.SUBUNIT_KNIGHT1)
{ {
@ -1274,11 +1277,10 @@ public class VillageMasterInstance extends NpcInstance
return; return;
} }
subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId()); subPledge.setLeaderId(member.getObjectId());
clan.updateSubPledgeInDB(subPledge.getId()); clan.updateSubPledgeInDB(subPledge.getId());
final ClanMember leaderSubPledge = clan.getClanMember(leaderName); final PlayerInstance leaderPlayer = member.getPlayerInstance();
final PlayerInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
if (leaderPlayer != null) if (leaderPlayer != null)
{ {
leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer)); leaderPlayer.setPledgeClass(ClanMember.calculatePledgeClass(leaderPlayer));