From 69348d6158802801a626938d5ced85807fd514d8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 14 Dec 2014 00:24:26 +0300 Subject: eathena: fix packet SMSG_PARTY_INVITED 0x02c6. --- src/net/eathena/partyhandler.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/net/eathena/partyhandler.cpp') diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp index 452cf1408..ea5b71089 100644 --- a/src/net/eathena/partyhandler.cpp +++ b/src/net/eathena/partyhandler.cpp @@ -152,12 +152,13 @@ void PartyHandler::invite(const std::string &name) const } void PartyHandler::inviteResponse(const std::string &inviter A_UNUSED, + const int partyId, const bool accept) const { if (localPlayer) { createOutPacket(CMSG_PARTY_INVITED2); - outMsg.writeInt32(localPlayer->getId(), "account id"); + outMsg.writeInt32(partyId, "party id"); outMsg.writeInt8(static_cast(accept ? 1 : 0), "accept"); } } @@ -501,20 +502,9 @@ void PartyHandler::processPartyInvited(Net::MessageIn &msg) { const int id = msg.readInt32("account id"); const std::string partyName = msg.readString(24, "party name"); - std::string nick; - - if (actorManager) - { - const Being *const being = actorManager->findBeing(id); - if (being) - { - if (being->getType() == ActorType::Player) - nick = being->getName(); - } - } if (socialWindow) - socialWindow->showPartyInvite(partyName, nick); + socialWindow->showPartyInvite(partyName, "", id); } } // namespace EAthena -- cgit v1.2.3-60-g2f50