diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-17 08:31:32 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-17 08:31:32 +0000 |
| commit | 6b1b1974a10bb5ad8f69d9f84d7babcc370f9264 (patch) | |
| tree | bad024738cb1a318420df132ac8b4fa9dc212a5f /src/map/guild.c | |
| parent | cf21db7985cfaf093cca2a1d4bc3e43e7f145ff3 (diff) | |
| download | hercules-6b1b1974a10bb5ad8f69d9f84d7babcc370f9264.tar.gz hercules-6b1b1974a10bb5ad8f69d9f84d7babcc370f9264.tar.bz2 hercules-6b1b1974a10bb5ad8f69d9f84d7babcc370f9264.tar.xz hercules-6b1b1974a10bb5ad8f69d9f84d7babcc370f9264.zip | |
* Changes to Dissonance -- don't increment the timer again if the target has died
* Changed some nullpo checks back to normal null checks
* Changed some nullpo checks to print some debug information
* Added some sd checks before calling pc_blockskill
* Added fix for SQL char's friend list updating
* Fixed a crash if the player invited to join a guild is not online
* Find the guild invitation sender first before clearing it
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1124 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index 72bf302f0..ed3eda3ba 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -581,17 +581,18 @@ int guild_member_added(int guild_id,int account_id,int char_id,int flag) if( (g=guild_search(guild_id))==NULL ) return 0; - if((sd==NULL || sd->guild_invite==0) && flag==0){ + if(sd==NULL || sd->guild_invite==0){ // キャラ側に登録できなかったため脱退要求を出す - if(battle_config.error_log) - printf("guild: member added error %d is not online\n",account_id); - intif_guild_leave(guild_id,account_id,char_id,0,"**登録失敗**"); + if (flag == 0) { + if(battle_config.error_log) + printf("guild: member added error %d is not online\n",account_id); + intif_guild_leave(guild_id,account_id,char_id,0,"**登録失敗**"); + } return 0; } - sd->guild_invite=0; - sd->guild_invite_account=0; - - sd2=map_id2sd(sd->guild_invite_account); + sd2 = map_id2sd(sd->guild_invite_account); + sd->guild_invite = 0; + sd->guild_invite_account = 0; if(flag==1){ // 失敗 if( sd2!=NULL ) |