summaryrefslogtreecommitdiff
path: root/src/char/mapif.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-07-06 23:24:27 +0200
committerHaru <haru@dotalux.com>2018-07-06 23:24:27 +0200
commit6c99adb0b3de4677fdcc28d636aeaa618ce04bb1 (patch)
tree16060ca60d876c40936794553aee053d9b13c8ee /src/char/mapif.c
parenteed4e9bb3a466cfe32bdb72df12c7ad2ceb0dd79 (diff)
downloadhercules-6c99adb0b3de4677fdcc28d636aeaa618ce04bb1.tar.gz
hercules-6c99adb0b3de4677fdcc28d636aeaa618ce04bb1.tar.bz2
hercules-6c99adb0b3de4677fdcc28d636aeaa618ce04bb1.tar.xz
hercules-6c99adb0b3de4677fdcc28d636aeaa618ce04bb1.zip
Fix a regression in inter_guild_add_member
Fixes #2122 Regression introduced in 735e2e8340c9522ee5a9afdcad29d191da29c8d4, #2108 Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/char/mapif.c')
-rw-r--r--src/char/mapif.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/char/mapif.c b/src/char/mapif.c
index e0565c126..6acf803e2 100644
--- a/src/char/mapif.c
+++ b/src/char/mapif.c
@@ -784,11 +784,7 @@ static int mapif_parse_GuildAddMember(int fd, int guild_id, const struct guild_m
{
nullpo_ret(m);
- if (!inter_guild->add_member(guild_id, m)) {
- mapif->guild_memberadded(fd, guild_id, m->account_id, m->char_id, 1); // 1: Failed to add
- } else {
- mapif->guild_memberadded(fd, guild_id, m->account_id, m->char_id, 0); // 0: success
- }
+ inter_guild->add_member(guild_id, m, fd);
return 0;
}