From a2aa7c577b6d69b8185111a8ea8781957ce45b38 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 12 May 2009 10:41:31 -0600
Subject: Handle in party status in a much saner way

---
 src/net/ea/partyhandler.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/net')

diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 0eda7792..072297dd 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -102,10 +102,6 @@ void PartyHandler::handleMessage(MessageIn &msg)
                     bool online = msg.readInt8() == 0;
 
                     partyWindow->updateMember(id, nick, leader, online);
-
-                    Being *being = beingManager->findBeing(id);
-                    if (being)
-                        being->setName(nick);
                 }
             }
             break;
@@ -229,7 +225,6 @@ void PartyHandler::handleMessage(MessageIn &msg)
                 msg.readInt8();     // fail
                 if (id == player_node->getId())
                 {
-                    player_node->setInParty(false);
                     partyWindow->clearMembers();
                     partyWindow->setVisible(false);
                     partyTab->chatLog(_("You have left the party."), BY_SERVER);
@@ -306,7 +301,7 @@ void PartyHandler::inviteResponse(const std::string &inviter, bool accept)
     MessageOut outMsg(CMSG_PARTY_INVITED);
     outMsg.writeInt32(player_node->getId());
     outMsg.writeInt32(accept ? 1 : 0);
-    player_node->setInParty(player_node->getInParty() || accept);
+    player_node->setInParty(player_node->isInParty() || accept);
 }
 
 void PartyHandler::leave()
-- 
cgit v1.2.3-70-g09d2