summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-08-28 00:18:58 +0300
committerAndrei Karas <akaras@inbox.ru>2011-08-28 00:18:58 +0300
commit106180f42f536f4b898a72f36af1b2be28d1a8ed (patch)
treed06085bba2d67e332dee981084751f255e57c7d3 /src
parent064a2aea075b9d519912e7fdb98c5e06eb4ab9f0 (diff)
downloadmv-106180f42f536f4b898a72f36af1b2be28d1a8ed.tar.gz
mv-106180f42f536f4b898a72f36af1b2be28d1a8ed.tar.bz2
mv-106180f42f536f4b898a72f36af1b2be28d1a8ed.tar.xz
mv-106180f42f536f4b898a72f36af1b2be28d1a8ed.zip
Fix guild name reset on players from time.
Diffstat (limited to 'src')
-rw-r--r--src/being.cpp1
-rw-r--r--src/net/ea/beinghandler.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 36aa00689..2d9194c6e 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -760,7 +760,6 @@ void Being::setGuildName(const std::string &name)
mGuildName = name;
}
-
void Being::setGuildPos(const std::string &pos A_UNUSED)
{
// logger->log("Got guild position \"%s\" for being %s(%i)", pos.c_str(), mName.c_str(), mId);
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 06e86f8a4..2714f94ce 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -29,6 +29,7 @@
#include "client.h"
#include "effectmanager.h"
#include "guild.h"
+#include "guildmanager.h"
#include "keyboardconfig.h"
#include "localplayer.h"
#include "logger.h"
@@ -661,7 +662,8 @@ void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg)
if ((dstBeing = actorSpriteManager->findBeing(msg.readInt32())))
{
dstBeing->setPartyName(msg.readString(24));
- dstBeing->setGuildName(msg.readString(24));
+ if (!guildManager || !guildManager->getEnableGuildBot())
+ dstBeing->setGuildName(msg.readString(24));
dstBeing->setGuildPos(msg.readString(24));
dstBeing->addToCache();
msg.readString(24); // Discard this