summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/guild.c2
-rw-r--r--src/map/status.c2
2 files changed, 4 insertions, 0 deletions
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) {