diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-26 20:56:39 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-26 20:56:39 +0000 |
| commit | 1c82999ec3876f8198b44919fdcdd0a7806613ce (patch) | |
| tree | 72e7ca246f6c2c62c3c1694a6d23a238caae4d8b /src/map/charcommand.c | |
| parent | 6f618da64a31933954f3f5cbe8b3608d16681ed1 (diff) | |
| download | hercules-1c82999ec3876f8198b44919fdcdd0a7806613ce.tar.gz hercules-1c82999ec3876f8198b44919fdcdd0a7806613ce.tar.bz2 hercules-1c82999ec3876f8198b44919fdcdd0a7806613ce.tar.xz hercules-1c82999ec3876f8198b44919fdcdd0a7806613ce.zip | |
- Fixed # commands not being blocked when muted if the mute config settings say you should be.
- Moved skill db reading before loading mobs so that the new mob condition checks work.
- Cleaned up the warning/errors of the mob skill reading function. They are now warnings if the skill is read anyway (default conditions are used) and an error when the skill is not loaded.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10075 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/charcommand.c')
| -rw-r--r-- | src/map/charcommand.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/charcommand.c b/src/map/charcommand.c index f531f3fc0..696abd7c7 100644 --- a/src/map/charcommand.c +++ b/src/map/charcommand.c @@ -181,6 +181,9 @@ is_charcommand(const int fd, struct map_session_data* sd, const char* message) { nullpo_retr(CharCommand_None, sd); + if (sd->sc.count && sd->sc.data[SC_NOCHAT].timer != -1 && sd->sc.data[SC_NOCHAT].val1&MANNER_NOCOMMAND) + return CharCommand_None; + if (!message || !*message) return CharCommand_None; |