3 files changed, 1 insertions, 25 deletions
diff --git a/src/map/guild.c b/src/map/guild.c
index 6193ed69b..889338a9c 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -340,15 +340,6 @@ void guild_makemember(struct guild_member *m,struct map_session_data *sd)
 	memcpy(m->name,sd->status.name,NAME_LENGTH);
 	return;
 }
-// ギルド競合確認
-int guild_check_conflict(struct map_session_data *sd)
-{
-	nullpo_retr(0, sd);
-
-	intif_guild_checkconflict(sd->status.guild_id,
-		sd->status.account_id,sd->status.char_id);
-	return 0;
-}
 
 // ギルドのEXPキャッシュをinter鯖にフラッシュする
 int guild_payexp_timer_sub(DBKey dataid, void *data, va_list ap)
@@ -770,10 +761,9 @@ int guild_member_added(int guild_id,int account_id,int char_id,int flag)
 	if( sd2!=NULL )
 		clif_guild_inviteack(sd2,2);
 
-	// いちおう競合確認
-	guild_check_conflict(sd);
 	//Next line commented because it do nothing, look at guild_recv_info [LuzZza]
 	//clif_charnameupdate(sd); //Update display name [Skotlex]
+
 	return 0;
 }
 
diff --git a/src/map/intif.c b/src/map/intif.c
index 72766c471..5c8cfc9a0 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -638,19 +638,6 @@ int intif_guild_message(int guild_id,int account_id,const char *mes,int len)
 
 	return 0;
 }
-// ギルド競合チェック要求
-int intif_guild_checkconflict(int guild_id,int account_id,int char_id)
-{
-	if (CheckForCharServer())
-		return 0;
-	WFIFOHEAD(inter_fd, 14);
-	WFIFOW(inter_fd, 0)=0x3038;
-	WFIFOL(inter_fd, 2)=guild_id;
-	WFIFOL(inter_fd, 6)=account_id;
-	WFIFOL(inter_fd,10)=char_id;
-	WFIFOSET(inter_fd,14);
-	return 0;
-}
 // ギルド基本情報変更要求
 int intif_guild_change_basicinfo(int guild_id,int type,const void *data,int len)
 {
diff --git a/src/map/intif.h b/src/map/intif.h
index 9ca982b88..4adfc0a6b 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -49,7 +49,6 @@ int intif_guild_leave(int guild_id, int account_id, int char_id, int flag, const
 int intif_guild_memberinfoshort(int guild_id, int account_id, int char_id, int online, int lv, int class_);
 int intif_guild_break(int guild_id);
 int intif_guild_message(int guild_id, int account_id, const char *mes, int len);
-int intif_guild_checkconflict(int guild_id, int account_id, int char_id);
 int intif_guild_change_gm(int guild_id, const char* name, int len);
 int intif_guild_change_basicinfo(int guild_id, int type, const void *data, int len);
 int intif_guild_change_memberinfo(int guild_id, int account_id, int char_id, int type, const void *data, int len);