summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-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;
}