summaryrefslogtreecommitdiff
path: root/src/map/guild.c
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-08 17:39:40 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-08 17:39:40 +0000
commitf77cbff9305f4d3c6dc49d870369bf0897864049 (patch)
tree43772fe62e422943239cc901f2168689b8b18d01 /src/map/guild.c
parentb5be01c5baca2d51da4ec9a138e3bb57eea7cbb4 (diff)
downloadhercules-f77cbff9305f4d3c6dc49d870369bf0897864049.tar.gz
hercules-f77cbff9305f4d3c6dc49d870369bf0897864049.tar.bz2
hercules-f77cbff9305f4d3c6dc49d870369bf0897864049.tar.xz
hercules-f77cbff9305f4d3c6dc49d870369bf0897864049.zip
- Added a new setting 'guild_skill_relog_delay' to activate the guild skills delay on Guild Master relog.
- The official setting is 'No', but this is an option for game masters. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11699 54d463be-8e91-2dee-dedb-b68131a5f0ec
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;