diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-11 16:08:44 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-11 16:08:44 +0000 |
| commit | ffb32401ad12791bf79c051ef5ea1f3976608514 (patch) | |
| tree | f35497c72797fe473f4da8fdfb80663246ccc6f8 /src/map/party.c | |
| parent | 2338a3bab2b1f22a1e298abf280ecf2a1534f743 (diff) | |
| download | hercules-ffb32401ad12791bf79c051ef5ea1f3976608514.tar.gz hercules-ffb32401ad12791bf79c051ef5ea1f3976608514.tar.bz2 hercules-ffb32401ad12791bf79c051ef5ea1f3976608514.tar.xz hercules-ffb32401ad12791bf79c051ef5ea1f3976608514.zip | |
* Fixed party invite packet 0xfe (ZC_REQ_JOIN_GROUP) using account id of the inviter rather than party id.
- Added support for new party invite packet 0x2c6 (ZC_PARTY_JOIN_REQ), introduction date guessed.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14844 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/party.c')
| -rw-r--r-- | src/map/party.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/map/party.c b/src/map/party.c index 47dba49e9..d229c576e 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -369,11 +369,19 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd) return 1; } -void party_reply_invite(struct map_session_data *sd,int account_id,int flag) +void party_reply_invite(struct map_session_data *sd,int party_id,int flag) { - struct map_session_data *tsd= map_id2sd(account_id); + struct map_session_data* tsd; struct party_member member; + if( sd->party_invite != party_id ) + {// forged + sd->party_invite = 0; + sd->party_invite_account = 0; + return; + } + tsd = map_id2sd(sd->party_invite_account); + if( flag == 1 && !sd->party_creating && !sd->party_joining ) {// accepted and allowed sd->party_joining = true; |