From ff4ed0b105b016aa3a7dad07db5fb00456bbe822 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 31 Oct 2008 22:09:41 +0000 Subject: Commit Mantis 521: Filter out Halloween `magic' from chat --- src/map/clif.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/map/clif.c b/src/map/clif.c index 8fc119e..ef5a72f 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7605,10 +7605,15 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c < WBUFL(buf,4) = sd->bl.id; memcpy(WBUFP(buf,8), RFIFOP(fd,4), RFIFOW(fd,2) - 4); magic_status = magic_message(sd, buf, WBUFW(buf, 2)); - if (magic_status) - sd->chat_threshold = 0; /* Don't treat repeated magic as spamming */ + if (magic_status) { + sd->chat_threshold = 0; + sd->chat_repeatmsg -= 2; - if (magic_status >= 0) + if (sd->chat_repeatmsg < 0) + sd->chat_repeatmsg = 0; + } + + if (magic_status == 0) clif_send(buf, WBUFW(buf,2), &sd->bl, sd->chatID ? CHAT_WOS : AREA_CHAT_WOC); } -- cgit v1.2.3-60-g2f50