6 files changed, 2 insertions, 68 deletions
diff --git a/src/char/int_party.c b/src/char/int_party.c
index e7f5fa501..78b856ebd 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -284,31 +284,6 @@ int party_check_empty(struct party *p) {
 	return 1;
 }
 
-// キャラの競合がないかチェック
-int party_check_conflict(int party_id, int account_id, int char_id)
-{
-	DBIterator* iter;
-	struct party_data* p;
-	int i;
-
-	iter = party_db->iterator(party_db);
-	for( p = (struct party_data*)iter->first(iter,NULL); iter->exists(iter); p = (struct party_data*)iter->next(iter,NULL) )
-	{
-		if (p->party.party_id == party_id) //No conflict to check
-			continue;
-
-		ARR_FIND( 0, MAX_PARTY, i, p->party.member[i].account_id == account_id && p->party.member[i].char_id == char_id );
-		if( i < MAX_PARTY )
-  		{
-			ShowWarning("int_party: party conflict! %d %d %d\n", account_id, party_id, p->party.party_id);
-			mapif_parse_PartyLeave(-1, p->party.party_id, account_id, char_id);
-		}
-	}
-	iter->destroy(iter);
-
-	return 0;
-}
-
 //-------------------------------------------------------------------
 // map serverへの通信
 
@@ -671,13 +646,10 @@ int mapif_parse_BreakParty(int fd, int party_id) {
 }
 
 // パ?ティメッセ?ジ送信
-int mapif_parse_PartyMessage(int fd, int party_id, int account_id, char *mes, int len) {
+int mapif_parse_PartyMessage(int fd, int party_id, int account_id, char *mes, int len)
+{
 	return mapif_party_message(party_id, account_id, mes, len, fd);
 }
-// パ?ティチェック要求
-int mapif_parse_PartyCheck(int fd, int party_id, int account_id, int char_id) {
-	return party_check_conflict(party_id, account_id, char_id);
-}
 
 int mapif_parse_PartyLeaderChange(int fd,int party_id,int account_id,int char_id)
 {
@@ -715,7 +687,6 @@ int inter_party_parse_frommap(int fd) {
 	case 0x3025: mapif_parse_PartyChangeMap(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOW(fd,14), RFIFOB(fd,16), RFIFOW(fd,17)); break;
 	case 0x3026: mapif_parse_BreakParty(fd, RFIFOL(fd,2)); break;
 	case 0x3027: mapif_parse_PartyMessage(fd, RFIFOL(fd,4), RFIFOL(fd,8), (char*)RFIFOP(fd,12), RFIFOW(fd,2)-12); break;
-	case 0x3028: mapif_parse_PartyCheck(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); break;
 	case 0x3029: mapif_parse_PartyLeaderChange(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); break;
 	default:
 		return 0;
diff --git a/src/char_sql/int_party.c b/src/char_sql/int_party.c
index a4769ebd6..a2e580416 100644
--- a/src/char_sql/int_party.c
+++ b/src/char_sql/int_party.c
@@ -331,13 +331,6 @@ int party_check_empty(struct party_data *p)
 	return 1;
 }
 
-
-// Check if a member is in two party, not necessary :)
-int party_check_conflict(int party_id,int account_id,int char_id)
-{
-	return 0;
-}
-
 //-------------------------------------------------------------------
 // map serverへの通信
 
@@ -718,11 +711,6 @@ int mapif_parse_PartyMessage(int fd,int party_id,int account_id,char *mes,int le
 {
 	return mapif_party_message(party_id,account_id,mes,len, fd);
 }
-// パーティチェック要求
-int mapif_parse_PartyCheck(int fd,int party_id,int account_id,int char_id)
-{
-	return party_check_conflict(party_id,account_id,char_id);
-}
 
 int mapif_parse_PartyLeaderChange(int fd,int party_id,int account_id,int char_id)
 {
@@ -765,7 +753,6 @@ int inter_party_parse_frommap(int fd)
 	case 0x3025: mapif_parse_PartyChangeMap(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10), RFIFOW(fd,14), RFIFOB(fd,16), RFIFOW(fd,17)); break;
 	case 0x3026: mapif_parse_BreakParty(fd, RFIFOL(fd,2)); break;
 	case 0x3027: mapif_parse_PartyMessage(fd, RFIFOL(fd,4), RFIFOL(fd,8), (char*)RFIFOP(fd,12), RFIFOW(fd,2)-12); break;
-	case 0x3028: mapif_parse_PartyCheck(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); break;
 	case 0x3029: mapif_parse_PartyLeaderChange(fd, RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10)); break;
 	default:
 		return 0;
diff --git a/src/map/intif.c b/src/map/intif.c
index 7b79fe452..896c30626 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -467,19 +467,6 @@ int intif_party_message(int party_id,int account_id,const char *mes,int len)
 	WFIFOSET(inter_fd,len+12);
 	return 0;
 }
-// パーティ競合チェック要求
-int intif_party_checkconflict(int party_id,int account_id,int char_id)
-{
-	if (CheckForCharServer())
-		return 0;
-	WFIFOHEAD(inter_fd,10 + NAME_LENGTH);
-	WFIFOW(inter_fd,0)=0x3028;
-	WFIFOL(inter_fd,2)=party_id;
-	WFIFOL(inter_fd,6)=account_id;
-	WFIFOL(inter_fd,10)=char_id;
-	WFIFOSET(inter_fd,14);
-	return 0;
-}
 
 int intif_party_leaderchange(int party_id,int account_id,int char_id)
 {
diff --git a/src/map/intif.h b/src/map/intif.h
index b4cc6792f..c32b09352 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -37,7 +37,6 @@ int intif_party_leave(int party_id,int account_id, int char_id);
 int intif_party_changemap(struct map_session_data *sd, int online);
 int intif_break_party(int party_id);
 int intif_party_message(int party_id, int account_id, const char *mes,int len);
-int intif_party_checkconflict(int party_id,int account_id,int char_id);
 int intif_party_leaderchange(int party_id,int account_id,int char_id);
 
 
diff --git a/src/map/party.c b/src/map/party.c
index 4a53d5038..28c5154e7 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -425,7 +425,6 @@ int party_member_added(int party_id,int account_id,int char_id, int flag)
 		p->data[i].sd = sd;
 	}
 
-	party_check_conflict(sd); //FIXME: is this neccessary?
 	clif_party_member_info(p,sd);
 	clif_party_option(p,sd,0x100);
 	clif_party_info(p,sd);
@@ -683,14 +682,6 @@ int party_recv_message(int party_id,int account_id,const char *mes,int len)
 	return 0;
 }
 
-int party_check_conflict(struct map_session_data *sd)
-{
-	nullpo_retr(0, sd);
-
-	intif_party_checkconflict(sd->status.party_id,sd->status.account_id,sd->status.char_id);
-	return 0;
-}
-
 int party_skill_check(struct map_session_data *sd, int party_id, int skillid, int skilllv)
 {
 	struct party_data *p;
diff --git a/src/map/party.h b/src/map/party.h
index e45b62c1e..65f585b10 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -59,7 +59,6 @@ void party_send_levelup(struct map_session_data *sd);
 int party_send_logout(struct map_session_data *sd);
 int party_send_message(struct map_session_data *sd,const char *mes,int len);
 int party_recv_message(int party_id,int account_id,const char *mes,int len);
-int party_check_conflict(struct map_session_data *sd);
 int party_skill_check(struct map_session_data *sd, int party_id, int skillid, int skilllv);
 int party_send_xy_clear(struct party_data *p);
 int party_exp_share(struct party_data *p,struct block_list *src,unsigned int base_exp,unsigned int job_exp,int zeny);