summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMathy <MathyM@users.noreply.github.com>2018-11-13 18:11:08 +0100
committerHaru <haru@dotalux.com>2018-11-13 18:19:33 +0100
commitd036c82b2080426c03d26f4d7c4015eab1fe1aed (patch)
treee2431a730beef0174d62c665ed9820ed93a23d69 /src
parent60643f1b7bbc2a21f44ab6663dee03d962ff6d6b (diff)
downloadhercules-d036c82b2080426c03d26f4d7c4015eab1fe1aed.tar.gz
hercules-d036c82b2080426c03d26f4d7c4015eab1fe1aed.tar.bz2
hercules-d036c82b2080426c03d26f4d7c4015eab1fe1aed.tar.xz
hercules-d036c82b2080426c03d26f4d7c4015eab1fe1aed.zip
Fixed character not joining its guild chat when joining a new guild.
Diffstat (limited to 'src')
-rw-r--r--src/map/guild.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 757dbb445..17bf7fa6b 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -828,6 +828,11 @@ static int guild_member_added(int guild_id, int account_id, int char_id, int fla
//Next line commented because it do nothing, look at guild_recv_info [LuzZza]
//clif->charnameupdate(sd); //Update display name [Skotlex]
+ // Makes the character join their respective guild's channel for #ally chat
+ if (channel->config->ally && channel->config->ally_autojoin) {
+ channel->join(g->channel, sd, "", true);
+ }
+
return 0;
}