diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
| commit | db1e60556c72b1b87ff2a384c556ccca724c46d6 (patch) | |
| tree | 22a5f4e9c4f436ef8e746e0a2d688de80c1597a6 /src/commands.cpp | |
| parent | c2bb49be52a92deccec7428b6859242688fc8987 (diff) | |
| parent | 1716861f0ee2f7a3714c5b44bb0f017c3d8d3b2c (diff) | |
| download | plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.gz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.bz2 plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.xz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/commands.cpp')
| -rw-r--r-- | src/commands.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/commands.cpp b/src/commands.cpp index 36ea69a0c..75347a9aa 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -77,6 +77,7 @@ #include "utils/gettext.h" #include "utils/process.h" +#include "utils/timer.h" #include "debug.h" @@ -742,6 +743,9 @@ impHandler(follow) if (!player_node) return; + if (!features.getBoolValue("allowFollow")) + return; + if (!args.empty()) player_node->setFollow(args); else if (tab && tab->getType() == ChatTab::TAB_WHISPER) |