summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-16 13:13:48 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-16 13:13:48 +0300
commit5b8f189276b3883253de31d5e7bbbf897d34c85b (patch)
treec3e6028d800e4caf4acb7ca3f45ba2e63e8df26b /src/net/eathena
parent47d811c90a4655b69f1846c16150efebbfa4ccfa (diff)
downloadplus-5b8f189276b3883253de31d5e7bbbf897d34c85b.tar.gz
plus-5b8f189276b3883253de31d5e7bbbf897d34c85b.tar.bz2
plus-5b8f189276b3883253de31d5e7bbbf897d34c85b.tar.xz
plus-5b8f189276b3883253de31d5e7bbbf897d34c85b.zip
Use guildmanager only if build with tmwa support.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/beinghandler.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index e5116a612..301c90b93 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -1489,16 +1489,8 @@ void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg)
{
dstBeing->setName(msg.readString(24, "char name"));
dstBeing->setPartyName(msg.readString(24, "party name"));
- if (!guildManager || !GuildManager::getEnableGuildBot())
- {
- dstBeing->setGuildName(msg.readString(24, "guild name"));
- dstBeing->setGuildPos(msg.readString(24, "guild pos"));
- }
- else
- {
- msg.readString(24, "guild name");
- msg.readString(24, "guild pos");
- }
+ dstBeing->setGuildName(msg.readString(24, "guild name"));
+ dstBeing->setGuildPos(msg.readString(24, "guild pos"));
dstBeing->addToCache();
}
BLOCK_END("BeingHandler::processPlayerGuilPartyInfo")