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

Improvements for new clan system member list.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-03-17 20:01:01 +00:00
parent fb1ceb841e
commit 27d92259cb
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/L2Clan.java
View File

@ -1734,12 +1734,12 @@ public class L2Clan implements IIdentifiable, INamable
public SubPledge createSubPledge(int pledgeType) public SubPledge createSubPledge(int pledgeType)
{ {
if ((_subPledges == null) || (_subPledges.get(pledgeType) != null)) if ((_subPledges.get(pledgeType) != null) || (pledgeType == PLEDGE_CLASS_COMMON))
{ {
return null; return null;
} }
final String subPledgeName = pledgeType == PLEDGE_CLASS_COMMON ? "COMMON" : "ELITE"; final String subPledgeName = "ELITE"; // For now only elite exists.
SubPledge subPledge = null; SubPledge subPledge = null;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
View File

@ -44,7 +44,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
player.sendPacket(new PledgeShowMemberListAll(clan, true)); player.sendPacket(new PledgeShowMemberListAll(clan, true));
for (L2PcInstance member : clan.getOnlineMembers(0)) for (L2ClanMember member : clan.getMembers())
{ {
if (member.getPledgeType() != L2Clan.PLEDGE_CLASS_COMMON) if (member.getPledgeType() != L2Clan.PLEDGE_CLASS_COMMON)
{ {

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
View File

@ -43,7 +43,7 @@ public final class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_name = member.getName(); _name = member.getName();
_level = member.getLevel(); _level = member.getLevel();
_classId = member.getClassId(); _classId = member.getClassId();
_objectId = member.getObjectId(); _objectId = member.isOnline() ? member.getObjectId() : 0;
_pledgeType = member.getPledgeType(); _pledgeType = member.getPledgeType();
_onlineStatus = member.getOnlineStatus(); _onlineStatus = member.getOnlineStatus();
} }

4
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/L2Clan.java
View File

@ -1734,12 +1734,12 @@ public class L2Clan implements IIdentifiable, INamable
public SubPledge createSubPledge(int pledgeType) public SubPledge createSubPledge(int pledgeType)
{ {
if ((_subPledges == null) || (_subPledges.get(pledgeType) != null)) if ((_subPledges.get(pledgeType) != null) || (pledgeType == PLEDGE_CLASS_COMMON))
{ {
return null; return null;
} }
final String subPledgeName = pledgeType == PLEDGE_CLASS_COMMON ? "COMMON" : "ELITE"; final String subPledgeName = "ELITE"; // For now only elite exists.
SubPledge subPledge = null; SubPledge subPledge = null;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
View File

@ -44,7 +44,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
player.sendPacket(new PledgeShowMemberListAll(clan, true)); player.sendPacket(new PledgeShowMemberListAll(clan, true));
for (L2PcInstance member : clan.getOnlineMembers(0)) for (L2ClanMember member : clan.getMembers())
{ {
if (member.getPledgeType() != L2Clan.PLEDGE_CLASS_COMMON) if (member.getPledgeType() != L2Clan.PLEDGE_CLASS_COMMON)
{ {

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
View File

@ -43,7 +43,7 @@ public final class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_name = member.getName(); _name = member.getName();
_level = member.getLevel(); _level = member.getLevel();
_classId = member.getClassId(); _classId = member.getClassId();
_objectId = member.getObjectId(); _objectId = member.isOnline() ? member.getObjectId() : 0;
_pledgeType = member.getPledgeType(); _pledgeType = member.getPledgeType();
_onlineStatus = member.getOnlineStatus(); _onlineStatus = member.getOnlineStatus();
} }

4
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/L2Clan.java
View File

@ -1734,12 +1734,12 @@ public class L2Clan implements IIdentifiable, INamable
public SubPledge createSubPledge(int pledgeType) public SubPledge createSubPledge(int pledgeType)
{ {
if ((_subPledges == null) || (_subPledges.get(pledgeType) != null)) if ((_subPledges.get(pledgeType) != null) || (pledgeType == PLEDGE_CLASS_COMMON))
{ {
return null; return null;
} }
final String subPledgeName = pledgeType == PLEDGE_CLASS_COMMON ? "COMMON" : "ELITE"; final String subPledgeName = "ELITE"; // For now only elite exists.
SubPledge subPledge = null; SubPledge subPledge = null;
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();

2
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
View File

@ -44,7 +44,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
player.sendPacket(new PledgeShowMemberListAll(clan, true)); player.sendPacket(new PledgeShowMemberListAll(clan, true));
for (L2PcInstance member : clan.getOnlineMembers(0)) for (L2ClanMember member : clan.getMembers())
{ {
if (member.getPledgeType() != L2Clan.PLEDGE_CLASS_COMMON) if (member.getPledgeType() != L2Clan.PLEDGE_CLASS_COMMON)
{ {

2
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
View File

@ -43,7 +43,7 @@ public final class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_name = member.getName(); _name = member.getName();
_level = member.getLevel(); _level = member.getLevel();
_classId = member.getClassId(); _classId = member.getClassId();
_objectId = member.getObjectId(); _objectId = member.isOnline() ? member.getObjectId() : 0;
_pledgeType = member.getPledgeType(); _pledgeType = member.getPledgeType();
_onlineStatus = member.getOnlineStatus(); _onlineStatus = member.getOnlineStatus();
} }