Index: java/net/sf/l2j/gameserver/clientpackets/RequestJoinParty.java =================================================================== --- java/net/sf/l2j/gameserver/clientpackets/RequestJoinParty.java (revision 2168) +++ java/net/sf/l2j/gameserver/clientpackets/RequestJoinParty.java (working copy) @@ -61,9 +61,9 @@ L2PcInstance requestor = getClient().getActiveChar(); L2PcInstance target = L2World.getInstance().getPlayer(_name); - if (requestor == null) + if (requestor == null) return; - + if (target == null) { requestor.sendPacket(new SystemMessage(SystemMessage.TARGET_IS_INCORRECT)); @@ -115,41 +115,33 @@ requestor.sendPacket(new SystemMessage(SystemMessage.PARTY_FULL)); return; } - + if (!requestor.getParty().isLeader(requestor)) { requestor.sendPacket(new SystemMessage(SystemMessage.ONLY_LEADER_CAN_INVITE)); return; } - if (target.getKnownList().knowsThePlayer(requestor)) + if (!target.isProcessingRequest()) { - // only continue if the client actually knowns the id - if (!target.isProcessingRequest()) - { - requestor.onTransactionRequest(target); - target.sendPacket(new AskJoinParty(requestor.getName(), _itemDistribution)); - requestor.getParty().increasePendingInvitationNumber(); - - if (Config.DEBUG) - _log.fine("sent out a party invitation to:"+target.getName()); - - msg = new SystemMessage(SystemMessage.YOU_INVITED_S1_TO_PARTY); - msg.addString(target.getName()); - requestor.sendPacket(msg); - } - else - { - msg = new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER); - requestor.sendPacket(msg); - - if (Config.DEBUG) - _log.warning(requestor.getName() + " already received a party invitation"); - } + requestor.onTransactionRequest(target); + target.sendPacket(new AskJoinParty(requestor.getName(), _itemDistribution)); + requestor.getParty().increasePendingInvitationNumber(); + + if (Config.DEBUG) + _log.fine("sent out a party invitation to:"+target.getName()); + + msg = new SystemMessage(SystemMessage.YOU_INVITED_S1_TO_PARTY); + msg.addString(target.getName()); + requestor.sendPacket(msg); } else { - _log.warning(requestor.getName()+ " invited someone who doesn't know him."); + msg = new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER); + requestor.sendPacket(msg); + + if (Config.DEBUG) + _log.warning(requestor.getName() + " already received a party invitation"); } } @@ -163,37 +155,29 @@ { SystemMessage msg; - if (target.getKnownList().knowsThePlayer(requestor)) + if (!target.isProcessingRequest()) { - if (!target.isProcessingRequest()) - { - requestor.setParty(new L2Party(requestor, _itemDistribution)); - - requestor.onTransactionRequest(target); - target.sendPacket(new AskJoinParty(requestor.getName(), _itemDistribution)); - requestor.getParty().increasePendingInvitationNumber(); - - if (Config.DEBUG) - _log.fine("sent out a party invitation to:"+target.getName()); - - msg = new SystemMessage(SystemMessage.YOU_INVITED_S1_TO_PARTY); - msg.addString(target.getName()); - requestor.sendPacket(msg); - } - else - { - msg = new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER); - msg.addString(target.getName()); - requestor.sendPacket(msg); - - if (Config.DEBUG) - _log.warning(requestor.getName() + " already received a party invitation"); - } + requestor.setParty(new L2Party(requestor, _itemDistribution)); + + requestor.onTransactionRequest(target); + target.sendPacket(new AskJoinParty(requestor.getName(), _itemDistribution)); + requestor.getParty().increasePendingInvitationNumber(); + + if (Config.DEBUG) + _log.fine("sent out a party invitation to:"+target.getName()); + + msg = new SystemMessage(SystemMessage.YOU_INVITED_S1_TO_PARTY); + msg.addString(target.getName()); + requestor.sendPacket(msg); } else { - if (target.getKnownList().knowsThePlayer(requestor)) - _log.warning(requestor.getName()+ " invited someone who doesn't know him."); + msg = new SystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER); + msg.addString(target.getName()); + requestor.sendPacket(msg); + + if (Config.DEBUG) + _log.warning(requestor.getName() + " already received a party invitation"); } }