summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-22 04:04:12 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-22 04:04:12 +0000
commit580860e1ded37cde82bc087cf63e4dd16d00b737 (patch)
treed2b2f03337ba404bdcb59bb1b52b5e6087343efe /src
parent72fc9343c79775d3c9df910ce78f5b0ee274cb81 (diff)
downloadhercules-580860e1ded37cde82bc087cf63e4dd16d00b737.tar.gz
hercules-580860e1ded37cde82bc087cf63e4dd16d00b737.tar.bz2
hercules-580860e1ded37cde82bc087cf63e4dd16d00b737.tar.xz
hercules-580860e1ded37cde82bc087cf63e4dd16d00b737.zip
- Added blocking of @me when muted or in berserk status.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7822 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/atcommand.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 54d2949f6..715fa84ab 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9961,6 +9961,10 @@ int atcommand_me(
memset(tempmes, '\0', sizeof(tempmes));
memset(atcmd_output, '\0', sizeof(atcmd_output));
+ if (sd->sc.count && //no "chatting" while muted.
+ (sd->sc.data[SC_BERSERK].timer!=-1 || sd->sc.data[SC_NOCHAT].timer != -1))
+ return -1;
+
if (!message || !*message) {
clif_displaymessage(fd, "Please, enter a message (usage: @me <message>).");
return -1;