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

One more clan issue fixed.

Browse Source 
Contributed by rocknowx.
This commit is contained in:
MobiusDev
2015-11-26 20:27:01 +00:00
parent 20e11faffc
commit faf7e56f47
4 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
View File

@ -19,7 +19,6 @@
package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Clan.RankPrivs;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.PledgePowerGradeList;
@ -40,12 +39,11 @@ public final class RequestPledgePowerGradeList extends L2GameClientPacket
@Override
protected void runImpl()
{
L2PcInstance player = getClient().getActiveChar();
L2Clan clan = player.getClan();
final L2PcInstance player = getClient().getActiveChar();
final L2Clan clan = player.getClan();
if (clan != null)
{
RankPrivs[] privs = clan.getAllRankPrivs();
player.sendPacket(new PledgePowerGradeList(privs));
player.sendPacket(new PledgePowerGradeList(clan));
}
}

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
View File

@ -81,7 +81,11 @@ public final class RequestPledgeSetMemberPowerGrade extends L2GameClientPacket
}
member.setPowerGrade(_powerGrade);
member.getPlayerInstance().sendPacket(new PledgeReceiveUpdatePower(member.getClan().getRankPrivs(_powerGrade).getBitmask()));
L2PcInstance player = member.getPlayerInstance();
if (player != null)
{
player.sendPacket(new PledgeReceiveUpdatePower(member.getClan().getRankPrivs(_powerGrade).getBitmask()));
}
clan.broadcastToOnlineMembers(new PledgeReceiveMemberInfo(member));
}

13
trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgePowerGradeList.java
View File

@ -18,15 +18,16 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Clan.RankPrivs;
public class PledgePowerGradeList extends L2GameServerPacket
{
private final RankPrivs[] _privs;
private final L2Clan _clan;
public PledgePowerGradeList(RankPrivs[] privs)
public PledgePowerGradeList(L2Clan clan)
{
_privs = privs;
_clan = clan;
}
@Override
@ -34,11 +35,11 @@ public class PledgePowerGradeList extends L2GameServerPacket
{
writeC(0xFE);
writeH(0x3D);
writeD(_privs.length);
for (RankPrivs temp : _privs)
writeD(_clan.getAllRankPrivs().length);
for (RankPrivs temp : _clan.getAllRankPrivs())
{
writeD(temp.getRank());
writeD(temp.getParty());
writeD(_clan.getPowerGradeParty(temp.getRank()));
}
}
}