summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-04 14:25:49 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-04 14:25:49 +0000
commit869b3c9303a403b8c50f68202c61a96c6d9b9332 (patch)
tree309d4606eea5328f7285cb2d725eedf39860d6e5 /src
parentc93d710544b7e6a3314932397a47f92d28478966 (diff)
downloadhercules-869b3c9303a403b8c50f68202c61a96c6d9b9332.tar.gz
hercules-869b3c9303a403b8c50f68202c61a96c6d9b9332.tar.bz2
hercules-869b3c9303a403b8c50f68202c61a96c6d9b9332.tar.xz
hercules-869b3c9303a403b8c50f68202c61a96c6d9b9332.zip
- 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
Diffstat (limited to 'src')
-rw-r--r--src/map/chat.c2
1 files changed, 1 insertions, 1 deletions
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;
}