summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-04-17 02:58:00 -0300
committershennetsind <ind@henn.et>2013-04-17 02:58:00 -0300
commit21d1bddf9557b50c6ff56b04c0d19dc6ef8aeddc (patch)
treeec187ed2dc16a56f02210d23fe8c1b279c25dfe9 /src
parent9b1b39fcb041f8c868efccf723f9163edbc6b2c0 (diff)
downloadhercules-21d1bddf9557b50c6ff56b04c0d19dc6ef8aeddc.tar.gz
hercules-21d1bddf9557b50c6ff56b04c0d19dc6ef8aeddc.tar.bz2
hercules-21d1bddf9557b50c6ff56b04c0d19dc6ef8aeddc.tar.xz
hercules-21d1bddf9557b50c6ff56b04c0d19dc6ef8aeddc.zip
Fixed Bug #7169
users can no longer attack while in chat rooms. Special Thanks to Judas! http://hercules.ws/board/tracker/issue-7169-chat-room-still-allows-attacking/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src')
-rw-r--r--src/map/chat.c7
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;