diff options
| author | Haru <haru@dotalux.com> | 2018-04-23 03:14:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 03:14:29 +0200 |
| commit | efeb386abc51baffa561f32d7d3b30868af767cd (patch) | |
| tree | 9de101741e8195c8c6c9b7cf5526172054ea1c03 /src/map/guild.c | |
| parent | 14432c034f4c87e06651e89f04df714dc76036a1 (diff) | |
| parent | 57ba23012d78b8bae37953d65831e932d1365283 (diff) | |
| download | hercules-efeb386abc51baffa561f32d7d3b30868af767cd.tar.gz hercules-efeb386abc51baffa561f32d7d3b30868af767cd.tar.bz2 hercules-efeb386abc51baffa561f32d7d3b30868af767cd.tar.xz hercules-efeb386abc51baffa561f32d7d3b30868af767cd.zip | |
Merge pull request #2005 from guilherme-gm/guildskillcd
Allow guild skills cooldown to continue when logged out
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index d33df5e08..d9833a2f4 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -552,7 +552,7 @@ int guild_recv_info(const struct guild *sg) if ((sd = map->nick2sd(sg->master)) != NULL) { //If the guild master is online the first time the guild_info is received, //that means he was the first to join, so apply guild skill blocking here. - if( battle_config.guild_skill_relog_delay ) + if( battle_config.guild_skill_relog_delay == 1) guild->block_skill(sd, 300000); //Also set the guild master flag. @@ -760,7 +760,7 @@ void guild_member_joined(struct map_session_data *sd) // set the Guild Master flag sd->state.gmaster_flag = 1; // prevent Guild Skills from being used directly after relog - if( battle_config.guild_skill_relog_delay ) + if( battle_config.guild_skill_relog_delay == 1 ) guild->block_skill(sd, 300000); } i = guild->getindex(g, sd->status.account_id, sd->status.char_id); |