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

Update clan window when player invited via clan entry.

Browse Source
This commit is contained in:
MobiusDev 2017-11-05 22:18:48 +00:00
parent 683474e8bf
commit 22525e49a2
6 changed files with 80 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
View File

@ -23,7 +23,11 @@ import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
import com.l2jmobius.gameserver.network.serverpackets.JoinPledge;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
import com.l2jmobius.gameserver.network.serverpackets.PledgeSkillList;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
/**
@ -66,6 +70,12 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
player.sendPacket(ui);
player.broadcastInfo();
// update clan list
clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(player));
PledgeShowMemberListAll.sendAllTo(player);
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
player.sendPacket(new PledgeSkillList(clan));
ClanEntryManager.getInstance().removePlayerApplication(clan.getId(), _playerId);
}
}

10
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
View File

@ -23,7 +23,11 @@ import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
import com.l2jmobius.gameserver.network.serverpackets.JoinPledge;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
import com.l2jmobius.gameserver.network.serverpackets.PledgeSkillList;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
/**
@ -66,6 +70,12 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
player.sendPacket(ui);
player.broadcastInfo();
// update clan list
clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(player));
PledgeShowMemberListAll.sendAllTo(player);
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
player.sendPacket(new PledgeSkillList(clan));
ClanEntryManager.getInstance().removePlayerApplication(clan.getId(), _playerId);
}
}

26
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
View File

@ -18,10 +18,15 @@ package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
import com.l2jmobius.gameserver.network.serverpackets.JoinPledge;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
import com.l2jmobius.gameserver.network.serverpackets.PledgeSkillList;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
/**
@ -49,13 +54,22 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
}
final PledgeRecruitInfo pledgeRecruitInfo = ClanEntryManager.getInstance().getClanById(_clanId);
if (pledgeRecruitInfo.getRecruitType() == 1)
if (pledgeRecruitInfo != null)
{
pledgeRecruitInfo.getClan().addClanMember(activeChar);
activeChar.sendPacket(new JoinPledge(_clanId));
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.broadcastInfo();
return;
final L2Clan clan = pledgeRecruitInfo.getClan();
if (clan != null)
{
clan.addClanMember(activeChar);
activeChar.sendPacket(new JoinPledge(_clanId));
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.broadcastInfo();
// update clan list
clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(activeChar));
PledgeShowMemberListAll.sendAllTo(activeChar);
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
activeChar.sendPacket(new PledgeSkillList(clan));
}
}
}
}

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
View File

@ -23,7 +23,11 @@ import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
import com.l2jmobius.gameserver.network.serverpackets.JoinPledge;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
import com.l2jmobius.gameserver.network.serverpackets.PledgeSkillList;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
/**
@ -66,6 +70,12 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
player.sendPacket(ui);
player.broadcastInfo();
// update clan list
clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(player));
PledgeShowMemberListAll.sendAllTo(player);
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
player.sendPacket(new PledgeSkillList(clan));
ClanEntryManager.getInstance().removePlayerApplication(clan.getId(), _playerId);
}
}

26
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
View File

@ -18,10 +18,15 @@ package com.l2jmobius.gameserver.network.clientpackets;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.instancemanager.ClanEntryManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
import com.l2jmobius.gameserver.network.serverpackets.JoinPledge;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
import com.l2jmobius.gameserver.network.serverpackets.PledgeSkillList;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
/**
@ -49,13 +54,22 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
}
final PledgeRecruitInfo pledgeRecruitInfo = ClanEntryManager.getInstance().getClanById(_clanId);
if (pledgeRecruitInfo.getRecruitType() == 1)
if (pledgeRecruitInfo != null)
{
pledgeRecruitInfo.getClan().addClanMember(activeChar);
activeChar.sendPacket(new JoinPledge(_clanId));
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.broadcastInfo();
return;
final L2Clan clan = pledgeRecruitInfo.getClan();
if (clan != null)
{
clan.addClanMember(activeChar);
activeChar.sendPacket(new JoinPledge(_clanId));
activeChar.sendPacket(new UserInfo(activeChar));
activeChar.broadcastInfo();
// update clan list
clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(activeChar));
PledgeShowMemberListAll.sendAllTo(activeChar);
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
activeChar.sendPacket(new PledgeSkillList(clan));
}
}
}
}

10
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
View File

@ -23,7 +23,11 @@ import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.L2GameClient;
import com.l2jmobius.gameserver.network.serverpackets.ExPledgeCount;
import com.l2jmobius.gameserver.network.serverpackets.JoinPledge;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
import com.l2jmobius.gameserver.network.serverpackets.PledgeSkillList;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
/**
@ -66,6 +70,12 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
player.sendPacket(ui);
player.broadcastInfo();
// update clan list
clan.broadcastToOnlineMembers(new PledgeShowMemberListUpdate(player));
PledgeShowMemberListAll.sendAllTo(player);
clan.broadcastToOnlineMembers(new ExPledgeCount(clan));
player.sendPacket(new PledgeSkillList(clan));
ClanEntryManager.getInstance().removePlayerApplication(clan.getId(), _playerId);
}
}