summaryrefslogtreecommitdiff
path: root/src/map/guild.c
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2015-09-17 14:01:54 +0200
committerHaruna <haru@dotalux.com>2015-09-17 14:01:54 +0200
commitc366543d6daa724fd2f9ebc1a258b103c7906828 (patch)
tree0b784088ea002299a51511e652007f3c81369a91 /src/map/guild.c
parent41ba7b50888610d43dcf3bcccb77ee3debe13532 (diff)
parent22d7f4fe24294b2fd59c1db6ef3d552aed86f670 (diff)
downloadhercules-c366543d6daa724fd2f9ebc1a258b103c7906828.tar.gz
hercules-c366543d6daa724fd2f9ebc1a258b103c7906828.tar.bz2
hercules-c366543d6daa724fd2f9ebc1a258b103c7906828.tar.xz
hercules-c366543d6daa724fd2f9ebc1a258b103c7906828.zip
Merge pull request #715 from 4144/mapchecks
Add missing checks to some files in map server
Diffstat (limited to 'src/map/guild.c')
-rw-r--r--src/map/guild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 15c65ec98..ac9322b6b 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -740,7 +740,7 @@ void guild_member_joined(struct map_session_data *sd)
sd->guild = g;
if (channel->config->ally && channel->config->ally_autojoin) {
- channel->join(g->channel, sd, NULL, true);
+ channel->join(g->channel, sd, "", true);
}
}