summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-11 22:17:11 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-11 22:17:11 +0000
commitaf43265c071e6836c064a42a843599c814708ef9 (patch)
tree78bb9b024f445adfb65ece0a8a0f82493ac14e76 /src/map
parentc0ff0b92f36dc0ee7a6995f869ad3e51667dc4df (diff)
downloadhercules-af43265c071e6836c064a42a843599c814708ef9.tar.gz
hercules-af43265c071e6836c064a42a843599c814708ef9.tar.bz2
hercules-af43265c071e6836c064a42a843599c814708ef9.tar.xz
hercules-af43265c071e6836c064a42a843599c814708ef9.zip
Fixed bugreport:4955 @changegm no longer functions within gvg castles, special thanks to masao
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16099 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index a20af53f7..a3212d43f 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -5683,20 +5683,17 @@ ACMD_FUNC(changegm)
struct map_session_data *pl_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.");
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.");
return -1;
}
- if( !message[0] )
- {
+ if( !message[0] ) {
clif_displaymessage(fd, "Command usage: @changegm <guildmember name>");
return -1;
}