Skip to content

Commit

Permalink
Merge pull request #2235 from dastgirp/issue/2210
Browse files Browse the repository at this point in the history
Fixed failed assertion in guild invite.
  • Loading branch information
MishimaHaruna authored Oct 7, 2018
2 parents 7120569 + 9ac40db commit d6c3435
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/map/guild.c
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,6 @@ static int guild_reply_invite(struct map_session_data *sd, int guild_id, int fla
}
else
{// accepted
struct guild_member m;
struct guild* g;
int i;

Expand All @@ -741,8 +740,8 @@ static int guild_reply_invite(struct map_session_data *sd, int guild_id, int fla
return 0;
}

guild->makemember(&m,sd);
intif->guild_addmember(guild_id, &m);
guild->makemember(&g->member[i], sd);
intif->guild_addmember(guild_id, &g->member[i]);
//TODO: send a minimap update to this player
}

Expand Down

0 comments on commit d6c3435

Please sign in to comment.