From 071be58854f037749f5ec160f1a0d50fc41b78eb Mon Sep 17 00:00:00 2001
From: zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 26 Feb 2009 21:27:12 +0000
Subject: - 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
---
 src/map/guild.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/map/guild.c')

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;
-- 
cgit v1.2.3-60-g2f50