From 2f8f562c2c85aaff8fe2f12c2f4ab3092f53bd9c Mon Sep 17 00:00:00 2001
From: Dennis Friis <peavey@inspircd.org>
Date: Tue, 23 Jun 2009 01:35:07 +0200
Subject: More fixes to storage derived from ea stable.

---
 src/map/pc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/src/map/pc.c b/src/map/pc.c
index 537e978..2a36438 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3424,10 +3424,10 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt
 		chat_leavechat(sd);
 	if(sd->trade_partner)	// �����𒆒f����
 		trade_tradecancel(sd);
-	if(sd->state.storage_flag)
-		storage_guild_storage_quit(sd,0);
-	else
+	if(sd->state.storage_flag == 1)
 		storage_storage_quit(sd);	// �q�ɂ��J���Ă��Ȃ��ۑ�����
+	else if (sd->state.storage_flag == 2)
+		storage_guild_storage_quit(sd,0);
 
 	if(sd->party_invite>0)	// �p�[�e�B���U��ۂ���
 		party_reply_invite(sd,sd->party_invite_account,0);
@@ -3495,6 +3495,7 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt
 				}
 				else if (sd->state.storage_flag == 2)
 					storage_guild_storageclose(sd);
+
 				chrif_changemapserver(sd, mapname, x, y, ip, port);
 				return 0;
 			}
-- 
cgit v1.2.3-70-g09d2