Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:4955 @changegm no longer functions within gvg castles, special thanks to masao

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16099 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-05-11 22:17:11 +00:00
parent a080d890bb
commit 2bb3fdceb3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/atcommand.c
View File

@ -5683,20 +5683,17 @@ ACMD_FUNC(changegm)
struct map_session_data *pl_sd; struct map_session_data *pl_sd;
nullpo_retr(-1, sd); nullpo_retr(-1, sd);
if (sd->status.guild_id == 0 || (g = guild_search(sd->status.guild_id)) == NULL || strcmp(g->master,sd->status.name)) if (sd->status.guild_id == 0 || (g = guild_search(sd->status.guild_id)) == NULL || strcmp(g->master,sd->status.name)) {
{
clif_displaymessage(fd, "You need to be a Guild Master to use this command."); clif_displaymessage(fd, "You need to be a Guild Master to use this command.");
return -1; return -1;
} }
if( map[sd->bl.m].flag.guildlock ) if( map[sd->bl.m].flag.guildlock || map[sd->bl.m].flag.gvg_castle ) {
{
clif_displaymessage(fd, "You cannot change guild leaders on this map."); clif_displaymessage(fd, "You cannot change guild leaders on this map.");
return -1; return -1;
} }
if( !message[0] ) if( !message[0] ) {
{
clif_displaymessage(fd, "Command usage: @changegm <guildmember name>"); clif_displaymessage(fd, "Command usage: @changegm <guildmember name>");
return -1; return -1;
} }