aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2016_03_28_00_world.sql3
-rw-r--r--src/server/game/Miscellaneous/Language.h3
-rw-r--r--src/server/scripts/Commands/cs_account.cpp7
3 files changed, 12 insertions, 1 deletions
diff --git a/sql/updates/world/2016_03_28_00_world.sql b/sql/updates/world/2016_03_28_00_world.sql
new file mode 100644
index 00000000000..868163c2be7
--- /dev/null
+++ b/sql/updates/world/2016_03_28_00_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `trinity_string` WHERE `entry`=1030;
+INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
+(1030,'You are attempting to create a battle.net account with wrong command, use .bnetaccount create');
diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h
index 4c3ce70fbef..58c9eada85c 100644
--- a/src/server/game/Miscellaneous/Language.h
+++ b/src/server/game/Miscellaneous/Language.h
@@ -896,7 +896,8 @@ enum TrinityStrings
LANG_SQLDRIVER_QUERY_LOGGING_ENABLED = 1027,
LANG_SQLDRIVER_QUERY_LOGGING_DISABLED = 1028,
LANG_ACCOUNT_INVALID_BNET_NAME = 1029,
- // Room for more level 4 1030-1099 not used
+ LANG_ACCOUNT_USE_BNET_COMMANDS = 1030,
+ // Room for more level 4 1031-1099 not used
// Level 3 (continue)
LANG_ACCOUNT_SETADDON = 1100,
diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
index 0edb5714934..b195d864222 100644
--- a/src/server/scripts/Commands/cs_account.cpp
+++ b/src/server/scripts/Commands/cs_account.cpp
@@ -121,6 +121,13 @@ public:
if (!accountName || !password)
return false;
+ if (strchr(accountName, '@'))
+ {
+ handler->PSendSysMessage(LANG_ACCOUNT_USE_BNET_COMMANDS);
+ handler->SetSentErrorMessage(true);
+ return false;
+ }
+
switch (sAccountMgr->CreateAccount(std::string(accountName), std::string(password), email))
{
case AccountOpResult::AOR_OK: