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

Fixing party invite NPE.

Browse Source
This commit is contained in:
MobiusDev 2015-04-29 15:12:15 +00:00
parent 2de792f6eb
commit 9e30c5aa1d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java
View File

@ -55,13 +55,13 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket
return; return;
} }
request.setProcessing(true); request.setProcessing(true);
final L2PcInstance requestor = request.getActiveChar(); final L2PcInstance requestor = request.getActiveChar();
if (requestor == null) if (requestor == null)
{ {
return; return;
} }
final L2Party party = requestor.getParty(); final L2Party party = requestor.getParty();
requestor.sendPacket(new JoinParty(_response)); requestor.sendPacket(new JoinParty(_response));
switch (_response) switch (_response)
@ -75,7 +75,6 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket
} }
case 0: // Party cancel by player case 0: // Party cancel by player
{ {
// requestor.sendPacket(SystemMessageId.THE_PLAYER_DECLINED_TO_JOIN_YOUR_PARTY); FIXME: Done in client? // requestor.sendPacket(SystemMessageId.THE_PLAYER_DECLINED_TO_JOIN_YOUR_PARTY); FIXME: Done in client?
break; break;
} }
@ -144,7 +143,7 @@ public final class RequestAnswerJoinParty extends L2GameClientPacket
} }
} }
if (requestor.isInParty()) if (party != null)
{ {
party.setPendingInvitation(false); // if party is null, there is no need of decreasing party.setPendingInvitation(false); // if party is null, there is no need of decreasing
} }