summaryrefslogtreecommitdiff
path: root/src/map/guild.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/guild.c')
-rw-r--r--src/map/guild.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 40449baf0..e111a91c3 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -553,10 +553,8 @@ int guild_recv_info(struct guild *sg)
guild_check_member(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,
- //and as such, his guild skills should be blocked to avoid login/logout abuse [Skotlex]
- //(optionally)
- //guild_block_skill(sd, 300000);
+ if( battle_config.guild_skill_relog_delay )
+ guild_block_skill(sd, 300000);
//Also set the guild master flag.
sd->state.gmaster_flag = g;