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

Clan entry improvements.

Browse Source
This commit is contained in:
MobiusDev 2018-09-10 04:23:56 +00:00
parent a335616fe5
commit 0dd9c40207
12 changed files with 234 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,10 +62,8 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
if (_acceptRequest)
{
final L2PcInstance player = L2World.getInstance().getPlayer(_playerId);
if ((player != null) && (player.getClan() == null))
{
final L2Clan clan = activeChar.getClan();
if (clan != null)
if ((player != null) && (player.getClan() == null) && (clan != null))
{
player.sendPacket(new JoinPledge(clan.getId()));
@ -98,14 +96,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
PledgeShowMemberListAll.sendAllTo(player);
player.setClanJoinExpiryTime(0);
player.broadcastUserInfo();
}
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
else
{
ClanEntryManager.getInstance().removePlayerApplication(activeChar.getClanId(), _playerId);
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
}

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

@ -62,10 +62,8 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
if (_acceptRequest)
{
final L2PcInstance player = L2World.getInstance().getPlayer(_playerId);
if ((player != null) && (player.getClan() == null))
{
final L2Clan clan = activeChar.getClan();
if (clan != null)
if ((player != null) && (player.getClan() == null) && (clan != null))
{
player.sendPacket(new JoinPledge(clan.getId()));
@ -98,14 +96,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
PledgeShowMemberListAll.sendAllTo(player);
player.setClanJoinExpiryTime(0);
player.broadcastUserInfo();
}
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
else
{
ClanEntryManager.getInstance().removePlayerApplication(activeChar.getClanId(), _playerId);
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
}

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

@ -93,6 +93,8 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
PledgeShowMemberListAll.sendAllTo(activeChar);
activeChar.setClanJoinExpiryTime(0);
activeChar.broadcastUserInfo();
ClanEntryManager.getInstance().removePlayerApplication(_clanId, activeChar.getObjectId());
}
}
}

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

@ -62,10 +62,8 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
if (_acceptRequest)
{
final L2PcInstance player = L2World.getInstance().getPlayer(_playerId);
if ((player != null) && (player.getClan() == null))
{
final L2Clan clan = activeChar.getClan();
if (clan != null)
if ((player != null) && (player.getClan() == null) && (clan != null))
{
player.sendPacket(new JoinPledge(clan.getId()));
@ -98,14 +96,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
PledgeShowMemberListAll.sendAllTo(player);
player.setClanJoinExpiryTime(0);
player.broadcastUserInfo();
}
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
else
{
ClanEntryManager.getInstance().removePlayerApplication(activeChar.getClanId(), _playerId);
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
}

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
View File

@ -93,6 +93,8 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
PledgeShowMemberListAll.sendAllTo(activeChar);
activeChar.setClanJoinExpiryTime(0);
activeChar.broadcastUserInfo();
ClanEntryManager.getInstance().removePlayerApplication(_clanId, activeChar.getObjectId());
}
}
}

7
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
View File

@ -62,10 +62,8 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
if (_acceptRequest)
{
final L2PcInstance player = L2World.getInstance().getPlayer(_playerId);
if ((player != null) && (player.getClan() == null))
{
final L2Clan clan = activeChar.getClan();
if (clan != null)
if ((player != null) && (player.getClan() == null) && (clan != null))
{
player.sendPacket(new JoinPledge(clan.getId()));
@ -98,14 +96,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
PledgeShowMemberListAll.sendAllTo(player);
player.setClanJoinExpiryTime(0);
player.broadcastUserInfo();
}
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
else
{
ClanEntryManager.getInstance().removePlayerApplication(activeChar.getClanId(), _playerId);
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
}

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

@ -93,6 +93,8 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
PledgeShowMemberListAll.sendAllTo(activeChar);
activeChar.setClanJoinExpiryTime(0);
activeChar.broadcastUserInfo();
ClanEntryManager.getInstance().removePlayerApplication(_clanId, activeChar.getObjectId());
}
}
}

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

@ -62,10 +62,8 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
if (_acceptRequest)
{
final L2PcInstance player = L2World.getInstance().getPlayer(_playerId);
if ((player != null) && (player.getClan() == null))
{
final L2Clan clan = activeChar.getClan();
if (clan != null)
if ((player != null) && (player.getClan() == null) && (clan != null))
{
player.sendPacket(new JoinPledge(clan.getId()));
@ -98,14 +96,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
PledgeShowMemberListAll.sendAllTo(player);
player.setClanJoinExpiryTime(0);
player.broadcastUserInfo();
}
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
else
{
ClanEntryManager.getInstance().removePlayerApplication(activeChar.getClanId(), _playerId);
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
}

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
View File

@ -93,6 +93,8 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
PledgeShowMemberListAll.sendAllTo(activeChar);
activeChar.setClanJoinExpiryTime(0);
activeChar.broadcastUserInfo();
ClanEntryManager.getInstance().removePlayerApplication(_clanId, activeChar.getObjectId());
}
}
}

7
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
View File

@ -62,10 +62,8 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
if (_acceptRequest)
{
final L2PcInstance player = L2World.getInstance().getPlayer(_playerId);
if ((player != null) && (player.getClan() == null))
{
final L2Clan clan = activeChar.getClan();
if (clan != null)
if ((player != null) && (player.getClan() == null) && (clan != null))
{
player.sendPacket(new JoinPledge(clan.getId()));
@ -98,14 +96,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
PledgeShowMemberListAll.sendAllTo(player);
player.setClanJoinExpiryTime(0);
player.broadcastUserInfo();
}
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
else
{
ClanEntryManager.getInstance().removePlayerApplication(activeChar.getClanId(), _playerId);
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
}

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSignInForOpenJoiningMethod.java
View File

@ -93,6 +93,8 @@ public class RequestPledgeSignInForOpenJoiningMethod implements IClientIncomingP
PledgeShowMemberListAll.sendAllTo(activeChar);
activeChar.setClanJoinExpiryTime(0);
activeChar.broadcastUserInfo();
ClanEntryManager.getInstance().removePlayerApplication(_clanId, activeChar.getObjectId());
}
}
}

7
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUserAccept.java
View File

@ -62,10 +62,8 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
if (_acceptRequest)
{
final L2PcInstance player = L2World.getInstance().getPlayer(_playerId);
if ((player != null) && (player.getClan() == null))
{
final L2Clan clan = activeChar.getClan();
if (clan != null)
if ((player != null) && (player.getClan() == null) && (clan != null))
{
player.sendPacket(new JoinPledge(clan.getId()));
@ -98,14 +96,13 @@ public class RequestPledgeWaitingUserAccept implements IClientIncomingPacket
PledgeShowMemberListAll.sendAllTo(player);
player.setClanJoinExpiryTime(0);
player.broadcastUserInfo();
}
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
else
{
ClanEntryManager.getInstance().removePlayerApplication(activeChar.getClanId(), _playerId);
ClanEntryManager.getInstance().removePlayerApplication(_clanId, _playerId);
}
}
}