summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-09 02:19:53 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-09 02:19:53 +0000
commit7a13b4b39286831e4e96780f0b60b855437d2879 (patch)
treef5da321195d4079e3ab4cca8a367a646002285ef /src/char
parentef008fd94916820f82d765a48d8502cbba974ce1 (diff)
downloadhercules-7a13b4b39286831e4e96780f0b60b855437d2879.tar.gz
hercules-7a13b4b39286831e4e96780f0b60b855437d2879.tar.bz2
hercules-7a13b4b39286831e4e96780f0b60b855437d2879.tar.xz
hercules-7a13b4b39286831e4e96780f0b60b855437d2879.zip
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8197 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char')
-rw-r--r--src/char/int_party.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/char/int_party.c b/src/char/int_party.c
index e26e659f6..5d9ab9123 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -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;