diff options
| author | Haru <haru@dotalux.com> | 2019-05-05 23:23:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 23:23:05 +0200 |
| commit | b1970eac663b641b93e30ec24f2b3d8ee02ce8f6 (patch) | |
| tree | f363d01b6181e4cfcdad109dc6d56873a73eaa15 /src/map/chat.c | |
| parent | aa79da0e801a536b22911d47fd12df351c36214e (diff) | |
| parent | b8ce5e9e1352abc45b08f92eb50890f202b1b230 (diff) | |
| download | hercules-b1970eac663b641b93e30ec24f2b3d8ee02ce8f6.tar.gz hercules-b1970eac663b641b93e30ec24f2b3d8ee02ce8f6.tar.bz2 hercules-b1970eac663b641b93e30ec24f2b3d8ee02ce8f6.tar.xz hercules-b1970eac663b641b93e30ec24f2b3d8ee02ce8f6.zip | |
Merge pull request #2432 from 4144/updatepackets
Update packets up to 2019-05-02
Diffstat (limited to 'src/map/chat.c')
| -rw-r--r-- | src/map/chat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/chat.c b/src/map/chat.c index 77a12a560..b650ff029 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -102,7 +102,7 @@ static bool chat_createpcchat(struct map_session_data *sd, const char *title, co if (sd->chat_id != 0) return false; //Prevent people abusing the chat system by creating multiple chats, as pointed out by End of Exam. [Skotlex] - if( sd->state.vending || sd->state.buyingstore ) + if (sd->state.vending || sd->state.prevend || sd->state.buyingstore) {// not chat, when you already have a store open return false; } @@ -147,7 +147,7 @@ static bool chat_joinchat(struct map_session_data *sd, int chatid, const char *p cd = map->id2cd(chatid); if (cd == NULL || cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m - || sd->state.vending || sd->state.buyingstore || sd->chat_id != 0 + || sd->state.vending || sd->state.prevend || sd->state.buyingstore || sd->chat_id != 0 || ((cd->owner->type == BL_NPC) ? cd->users+1 : cd->users) >= cd->limit ) { clif->joinchatfail(sd,0); // room full |