From bba3da2fd707dc611524e28c1c5a6707b1ad4c22 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Mon, 22 May 2017 22:36:27 +0200 Subject: [PATCH] Fixed a missing alliance channel check Fixes #2158 Thanks to @Canoe for the bug report and solution! --- src/map/guild.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/map/guild.c b/src/map/guild.c index 927e53667f..246f0f3b77 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1662,7 +1662,11 @@ int guild_allianceack(int guild_id1,int guild_id2,uint32 account_id1,uint32 acco struct map_session_data *sd_mem = g[i]->member[j].sd; if( sd_mem!=NULL){ clif_guild_allianceinfo(sd_mem); - channel_gjoin(sd_mem,2); //join ally join + + // join ally channel + if( channel_config.ally_tmpl.name != NULL && (channel_config.ally_tmpl.opt&CHAN_OPT_AUTOJOIN) ) { + channel_gjoin(sd_mem,2); + } } } }