diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-22 04:04:12 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-22 04:04:12 +0000 |
| commit | 580860e1ded37cde82bc087cf63e4dd16d00b737 (patch) | |
| tree | d2b2f03337ba404bdcb59bb1b52b5e6087343efe | |
| parent | 72fc9343c79775d3c9df910ce78f5b0ee274cb81 (diff) | |
| download | hercules-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
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/atcommand.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 36ea097fc..e67baf0ad 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/21
+ * Added blocking of @me when muted or in berserk status. [Skotlex]
* Corrected the @follow timer not being deleted on logout. [Skotlex]
* Applied the homunculus code fixes provided by Toms. [Skotlex]
* battle_check_target will now tag homunculus as invalid target when the
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;
|