From 869b3c9303a403b8c50f68202c61a96c6d9b9332 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 4 Jul 2006 14:25:49 +0000 Subject: - Added a check when joining a chat to make sure the target object is of type BL_CHAT. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7512 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 3 +++ src/map/chat.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 75c56c97a..c496c84c5 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2006/07/04 + * Added a check when joining a chat to make sure the target object is of + type BL_CHAT. [Skotlex] 2006/07/03 * Cleared up the bAutoSpellWhenHit description in doc/item_bonus.txt [Skotelx] diff --git a/src/map/chat.c b/src/map/chat.c index 5a6235223..d031a446b 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -81,7 +81,7 @@ int chat_joinchat (struct map_session_data *sd, int chatid, char* pass) //a wrong chat id can be received. [Skotlex] if (cd == NULL) return 1; - if (cd->bl.m != sd->bl.m || sd->vender_id || sd->chatID || cd->limit <= cd->users) { + if (cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m || sd->vender_id || sd->chatID || cd->limit <= cd->users) { clif_joinchatfail(sd,0); return 0; } -- cgit v1.2.3-70-g09d2