diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-11 13:11:15 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-11 13:11:15 +0000 |
commit | ea4d8114ce4aa030d224acdd00af66d0ee1a979d (patch) | |
tree | a7cd9a82bee432937222bec025aa77fa9e7896da /src/map/party.c | |
parent | a24b7ddbd3dcc44f9a158414340283b2aa25ff6d (diff) | |
download | hercules-ea4d8114ce4aa030d224acdd00af66d0ee1a979d.tar.gz hercules-ea4d8114ce4aa030d224acdd00af66d0ee1a979d.tar.bz2 hercules-ea4d8114ce4aa030d224acdd00af66d0ee1a979d.tar.xz hercules-ea4d8114ce4aa030d224acdd00af66d0ee1a979d.zip |
- 'Forget me Not' no longer blocks ASPD bonuses from working or prevents their re-casting, they are simply dispelled when the effect takes place.
- Fixed a possible crash when a player logs out before their create-party request is accepted.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12193 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/party.c')
-rw-r--r-- | src/map/party.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/party.c b/src/map/party.c index c6bfb2224..47648b889 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -108,9 +108,12 @@ int party_created(int account_id,int char_id,int fail,int party_id,char *name) struct party_data *p; sd=map_id2sd(account_id); - nullpo_retr(0, sd); - if (sd->status.char_id != char_id) - return 0; //unlikely failure... + if (!sd || sd->status.char_id != char_id) + { //Character logged off before creation ack? + if (!fail) //break up party since player could not be added to it. + intif_party_leave(party_id,account_id,char_id); + return 0; + } if(fail){ clif_party_created(sd,1); |