summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-08 16:54:12 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-09-08 16:54:12 +0000
commit1cb7bccd571f966508747ad04a9b3ef88e579427 (patch)
treeda5290c6b7b39a683815e339e0d43e1ee02a88eb
parent6df9ad7456c42dfc676822492130cc5f2575fe2f (diff)
downloadhercules-1cb7bccd571f966508747ad04a9b3ef88e579427.tar.gz
hercules-1cb7bccd571f966508747ad04a9b3ef88e579427.tar.bz2
hercules-1cb7bccd571f966508747ad04a9b3ef88e579427.tar.xz
hercules-1cb7bccd571f966508747ad04a9b3ef88e579427.zip
Adjusted a spot that still caused a guild leader's guild skills to get blocked on login
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11146 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/guild.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index bfe32de0b..aa5e4b058 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2007/09/08
+ * Adjusted a spot that still blocked GL's skills on login [ultramage]
2007/09/07
* Added support for the new party invite/reply packets from the latest
client version.
diff --git a/src/map/guild.c b/src/map/guild.c
index a0f894f18..f9773d440 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -550,11 +550,13 @@ int guild_recv_info(struct guild *sg)
// 最初のロードなのでユーザーのチェックを行う
guild_check_member(sg);
- //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]
if ((sd = map_nick2sd(sg->master)) != NULL)
{
- guild_block_skill(sd, 300000);
+ //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);
+
//Also set the guild master flag.
sd->state.gmaster_flag = g;
clif_charnameupdate(sd); // [LuzZza]