diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-27 12:09:32 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-27 12:09:32 +0200 |
| commit | 55eafa247d91e24bd59a369daa05b05d20334791 (patch) | |
| tree | d9cd3bfe6c7d63860916e8c1fdab28a009a33bb5 /src/server/scripts/Commands | |
| parent | 7a93e93c9f2afcef80034399ae6754abd1f77152 (diff) | |
| parent | 6699d969f3114b60109288caebee7b5d7d86b61e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/authserver/Server/AuthSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_wp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index b1a90cf6f2e..9b8f6aff992 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -546,7 +546,7 @@ public: // Check // Remember: "show" must also be the name of a column! if ((show != "delay") && (show != "action") && (show != "action_chance") - && (show != "move_flag") && (show != "del") && (show != "move") + && (show != "move_type") && (show != "del") && (show != "move") ) { return false; |