summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2015-04-02 08:51:14 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2015-04-02 08:51:14 +0800
commit94899de0397d74b0f06bdccdbfc67eabd2d06e38 (patch)
tree322bdaeae036291ab38d535a9c1b2e6e6e2c8366 /src/map/clif.c
parent19228956cc31c6406366a69d06a76467451def3a (diff)
parent60844f655aaa7adb735674d51bb3a83b90c8c6db (diff)
downloadhercules-94899de0397d74b0f06bdccdbfc67eabd2d06e38.tar.gz
hercules-94899de0397d74b0f06bdccdbfc67eabd2d06e38.tar.bz2
hercules-94899de0397d74b0f06bdccdbfc67eabd2d06e38.tar.xz
hercules-94899de0397d74b0f06bdccdbfc67eabd2d06e38.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules into JobDBRedesign
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 22d259006..d28e64cd3 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9265,6 +9265,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) {
if (channel->config->local && channel->config->local_autojoin) {
channel->map_join(sd);
}
+ if (channel->config->irc && channel->config->irc_autojoin) {
+ channel->irc_join(sd);
+ }
}
mail->clear(sd);