diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-26 21:27:12 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-02-26 21:27:12 +0000 |
| commit | 071be58854f037749f5ec160f1a0d50fc41b78eb (patch) | |
| tree | 08a389d812e1ad88b84dd9638e2a155c5d948f9a /src/map/guild.c | |
| parent | b4b0462ea9eac4718cae3efc099579dcd14f2eed (diff) | |
| download | hercules-071be58854f037749f5ec160f1a0d50fc41b78eb.tar.gz hercules-071be58854f037749f5ec160f1a0d50fc41b78eb.tar.bz2 hercules-071be58854f037749f5ec160f1a0d50fc41b78eb.tar.xz hercules-071be58854f037749f5ec160f1a0d50fc41b78eb.zip | |
- Fixed item Nemesis.
- Fixed Tarot Card being used on Emperium.
- First Part of BattleGround Implementation (please wait).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13550 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index 8f9137943..5296f5970 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -373,12 +373,11 @@ int guild_send_xy_timer_sub(DBKey key,void *data,va_list ap) for(i=0;i<g->max_member;i++){ //struct map_session_data* sd = g->member[i].sd; struct map_session_data* sd = map_charid2sd(g->member[i].char_id); // temporary crashfix - if( sd != NULL ) { - if(sd->guild_x!=sd->bl.x || sd->guild_y!=sd->bl.y){ - clif_guild_xy(sd); - sd->guild_x=sd->bl.x; - sd->guild_y=sd->bl.y; - } + if( sd != NULL && (sd->guild_x != sd->bl.x || sd->guild_y != sd->bl.y) && !sd->state.bg_id ) + { + clif_guild_xy(sd); + sd->guild_x = sd->bl.x; + sd->guild_y = sd->bl.y; } } return 0; |