diff options
author | mekolat <mekolat@users.noreply.github.com> | 2015-08-12 14:52:37 -0400 |
---|---|---|
committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-15 11:45:40 -0400 |
commit | 657526889f6a36d79e34ab77e25377fd46d8905c (patch) | |
tree | 334ca14da4d2d6c0d71b22edccd9bc331608fa0f /src/map/clif.cpp | |
parent | a185a08be08bf790141b3aa1b6fcecaea5915a7e (diff) | |
download | tmwa-657526889f6a36d79e34ab77e25377fd46d8905c.tar.gz tmwa-657526889f6a36d79e34ab77e25377fd46d8905c.tar.bz2 tmwa-657526889f6a36d79e34ab77e25377fd46d8905c.tar.xz tmwa-657526889f6a36d79e34ab77e25377fd46d8905c.zip |
give priority to custom commands over built-in commands
Diffstat (limited to 'src/map/clif.cpp')
-rw-r--r-- | src/map/clif.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 33de3e6..726d45c 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -3830,11 +3830,11 @@ RecvResult clif_parse_GlobalMessage(Session *s, dumb_ptr<map_session_data> sd) return rv; } - if (is_atcommand(s, sd, mbuf, GmLevel())) - return rv; - if (!magic_message(sd, mbuf)) { + if (is_atcommand(s, sd, mbuf, GmLevel())) + return rv; + /* Don't send chat that results in an automatic ban. */ if (tmw_CheckChatSpam(sd, mbuf)) { |