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

Sanity cleanup for player.getPlayer() uses.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-07-29 22:53:21 +00:00
parent bb9334a053
commit 117100b50c
29 changed files with 26 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
View File

@ -490,9 +490,9 @@ public class ClanTable
public void checkSurrender(Clan clan1, Clan clan2)
{
int count = 0;
for (ClanMember player : clan1.getMembers())
for (ClanMember member : clan1.getMembers())
{
if ((player != null) && (player.getPlayer().getWantsPeace() == 1))
if ((member != null) && (member.getPlayer().getWantsPeace() == 1))
{
count++;
}

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
View File

@ -57,19 +57,19 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_isOnline = _player.isOnline() ? _player.getObjectId() : 0;
}
public PledgeShowMemberListUpdate(ClanMember player)
public PledgeShowMemberListUpdate(ClanMember member)
{
_player = player.getPlayer();
_name = player.getName();
_level = player.getLevel();
_classId = player.getClassId();
_isOnline = player.isOnline() ? player.getObjectId() : 0;
_pledgeType = player.getPledgeType();
_player = member.getPlayer();
_name = member.getName();
_level = member.getLevel();
_classId = member.getClassId();
_isOnline = member.isOnline() ? member.getObjectId() : 0;
_pledgeType = member.getPledgeType();
if (_pledgeType == Clan.SUBUNIT_ACADEMY)
{
_hasSponsor = _player.getSponsor() != 0 ? 1 : 0;
}
else if (player.isOnline())
else if (member.isOnline())
{
_hasSponsor = _player.isClanLeader() ? 1 : 0;
}