diff options
| author | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
|---|---|---|
| committer | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
| commit | 8c3c4577bde31ccee677ea75649b89cfa5822240 (patch) | |
| tree | 6f1c3cf85deea0932b974d5a8943184966bff46a /src/map/chat.c | |
| parent | 3a6517e14649805db47b332934f4cad972d00e95 (diff) | |
| parent | 038174e232c03519474f86e5738cecac34bbdee3 (diff) | |
| download | hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.gz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.bz2 hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.xz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Diffstat (limited to 'src/map/chat.c')
| -rw-r--r-- | src/map/chat.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/chat.c b/src/map/chat.c index f908e94ef..a18e87eef 100644 --- a/src/map/chat.c +++ b/src/map/chat.c @@ -96,15 +96,14 @@ int chat_createpcchat(struct map_session_data* sd, const char* title, const char pc_stop_walking(sd,1); cd = chat_createchat(&sd->bl, title, pass, limit, pub, 0, "", 0, 1, MAX_LEVEL); - if( cd ) - { + if( cd ) { cd->users = 1; cd->usersd[0] = sd; pc_setchatid(sd,cd->bl.id); + pc_stop_attack(sd); clif->createchat(sd,0); clif->dispchat(cd,0); - } - else + } else clif->createchat(sd,1); return 0; |