- Fixed the char-server not invoking the party_calc_state function when the third party-member is added to a party, hence failing to check for families and disabling even share from them unless all three relog first (state is correctly calculated when party is first loaded).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8197 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-08-09 02:19:53 +00:00
parent 0c91b56537
commit 9456f83ac2
3 changed files with 14 additions and 8 deletions

View File

@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/08
* Fixed the char-server not invoking the party_calc_state function when the
third party-member is added to a party, hence failing to check for families
and disabling even share from them unless all three relog first (state is
correctly calculated when party is first loaded). [Skotlex]
* Crash-protections in the mail-checking function. [Skotlex]
* Some additional parenthesis on equipment check in pc_equipitem, seems to
have fixed the mid/lower headgear-sprites not showing up. [Skotlex]

View File

@ -554,12 +554,13 @@ int mapif_parse_PartyAddMember(int fd, int party_id, struct party_member *member
p->party.member[i].leader = 0;
if (p->party.member[i].online) p->party.count++;
p->size++;
if (member->lv < p->min_lv || member->lv > p->max_lv || p->family)
{
if (p->size == 3) //Check family state.
int_party_calc_state(p);
else //Check even share range.
if (member->lv < p->min_lv || member->lv > p->max_lv || p->family) {
if (p->family) p->family = 0; //Family state broken.
int_party_check_lv(p);
} else if (p->size == 3) //Check family state.
int_party_calc_state(p);
}
mapif_party_memberadded(fd, party_id, member->account_id, member->char_id, 0);
mapif_party_info(-1, &p->party);
return 0;

View File

@ -617,12 +617,13 @@ int mapif_parse_PartyAddMember(int fd, int party_id, struct party_member *member
p->party.member[i].leader=0;
if (p->party.member[i].online) p->party.count++;
p->size++;
if (member->lv < p->min_lv || member->lv > p->max_lv || p->family)
{
if (p->size == 3) //Check family state.
int_party_calc_state(p);
else //Check even share range.
if (member->lv < p->min_lv || member->lv > p->max_lv || p->family) {
if (p->family) p->family = 0; //Family state broken.
int_party_check_lv(p);
} else if (p->size == 3) //Check family state.
int_party_calc_state(p);
}
mapif_party_memberadded(fd,party_id,member->account_id,member->char_id,0);
mapif_party_info(-1,&p->party);