From 576b80efa1c556796c13f195467e0dd1cea5631b Mon Sep 17 00:00:00 2001 From: daegaladh Date: Sat, 21 Jul 2012 04:08:44 +0000 Subject: Fixed an old bug in waitingroom where NPCs weren't appearing into their chatrooms. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16461 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/chat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/chat.c') diff --git a/src/map/chat.c b/src/map/chat.c index 9a59950d4..5a0f1123e 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -119,7 +119,7 @@ int chat_joinchat(struct map_session_data* sd, int chatid, const char* pass) nullpo_ret(sd); cd = (struct chat_data*)map_id2bl(chatid); - if( cd == NULL || cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m || sd->state.vending || sd->state.buyingstore || sd->chatID || cd->users >= cd->limit ) + if( cd == NULL || cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m || sd->state.vending || sd->state.buyingstore || sd->chatID || ((cd->owner->type == BL_NPC) ? cd->users+1 : cd->users) >= cd->limit ) { clif_joinchatfail(sd,0); return 0; -- cgit v1.2.3-70-g09d2