summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-03 14:09:02 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-03 14:09:02 +0000
commit5121b65cf4119fa6424249b59f11bc38ec43651d (patch)
treef1ebb558702aa8fb7b35c9d167f9e5b8bf8e6779
parented8e0849c8743e5a509a0384e2ebcc3beeca3952 (diff)
downloadhercules-5121b65cf4119fa6424249b59f11bc38ec43651d.tar.gz
hercules-5121b65cf4119fa6424249b59f11bc38ec43651d.tar.bz2
hercules-5121b65cf4119fa6424249b59f11bc38ec43651d.tar.xz
hercules-5121b65cf4119fa6424249b59f11bc38ec43651d.zip
- Meh, the status change start switch was supposed to be minimized, not altogether removed :X (the idea is to let anything with sc_data to go through)
- After a guild master change, the new gm has his guild skills blocked for 5 minutes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5171 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/guild.c2
-rw-r--r--src/map/status.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3fc730291..3ef2a8165 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/03
+ * After a guild master change, the new guild master has his guild skills
+ blocked for 5 minutes to prevent abuse. [Skotlex]
* Fixed txt-converter compilation errors [Komurka]
2006/02/02
diff --git a/src/map/guild.c b/src/map/guild.c
index 9a12b0425..47970e147 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1609,6 +1609,8 @@ int guild_gm_changed(int guild_id, int pos)
{
clif_displaymessage(g->member[0].sd->fd, "You have become the Guild Master!");
g->member[0].sd->state.gmaster_flag = g;
+ //Block his skills for 5 minutes to prevent abuse.
+ guild_block_skill(g->member[0].sd, 300000);
}
return 1;
}
diff --git a/src/map/status.c b/src/map/status.c
index 68a1838f0..7729ee152 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3644,6 +3644,7 @@ int status_change_start(struct block_list *bl,int type,int val1,int val2,int val
if (((struct mob_data*)bl)->class_ == MOBID_EMPERIUM && type != SC_SAFETYWALL)
return 0; //Emperium can't be afflicted by status changes.
break;
+ /* For more flexibility. Anything that has a sc data, let it through. [Skotlex]
case BL_PET: //Because pets can't have status changes.
case BL_SKILL: //These may happen by attacking traps or the like. [Skotlex]
return 0;
@@ -3651,6 +3652,7 @@ int status_change_start(struct block_list *bl,int type,int val1,int val2,int val
if(battle_config.error_log)
ShowError("status_change_start: invalid source type (%d)!\n", bl->type);
return 0;
+ */
}
if(type < 0 || type >= SC_MAX) {