pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-17 14:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ls tweaks

Browse Source
This commit is contained in:
Akkadius 2019-07-05 21:22:35 -05:00
parent 3eb102a006
commit a9969e500b
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/string_util.cpp
View File

@ -249,7 +249,6 @@ void ParseAccountString(const std::string &s, std::string &account, std::string
account = split[1]; account = split[1];
} }
else if(split.size() == 1) { else if(split.size() == 1) {
loginserver = "eqemu";
account = split[0]; account = split[0];
} }
} }

18
loginserver/client.cpp
View File

@ -199,7 +199,12 @@ void Client::Handle_Login(const char *data, unsigned int size)
char *login_packet_buffer = nullptr; char *login_packet_buffer = nullptr;
unsigned int db_account_id = 0; unsigned int db_account_id = 0;
std::string db_loginserver = "eqemu";
std::string db_loginserver = "local";
if (server.options.CanAutoLinkAccounts()) {
db_loginserver = "eqemu";
}
std::string db_account_password_hash; std::string db_account_password_hash;
std::string outbuffer; std::string outbuffer;
@ -310,7 +315,12 @@ void Client::Handle_Play(const char *data)
auto sequence_in = (unsigned int) play->Sequence; auto sequence_in = (unsigned int) play->Sequence;
if (server.options.IsTraceOn()) { if (server.options.IsTraceOn()) {
LogInfo("Play received from client, server number {0} sequence {1}", server_id_in, sequence_in); LogInfo(
"Play received from client [{0}] server number {1} sequence {2}",
GetAccountName(),
server_id_in,
sequence_in
);
} }
this->play_server_id = (unsigned int) play->ServerNumber; this->play_server_id = (unsigned int) play->ServerNumber;
@ -373,10 +383,10 @@ void Client::AttemptLoginAccountCreation(
const std::string &loginserver const std::string &loginserver
) )
{ {
if (loginserver == "eqemu") {
LogInfo("Attempting login account creation via '{0}'", loginserver); LogInfo("Attempting login account creation via '{0}'", loginserver);
if (loginserver == "eqemu") {
if (!server.options.CanAutoLinkAccounts()) { if (!server.options.CanAutoLinkAccounts()) {
LogInfo("CanAutoLinkAccounts disabled - sending failed login"); LogInfo("CanAutoLinkAccounts disabled - sending failed login");
DoFailedLogin(); DoFailedLogin();

4
loginserver/database.cpp
View File

@ -192,7 +192,7 @@ bool Database::GetLoginTokenDataFromToken(
unsigned int Database::GetFreeID(const std::string &loginserver) unsigned int Database::GetFreeID(const std::string &loginserver)
{ {
auto query = fmt::format( auto query = fmt::format(
"SELECT MAX(LoginServerID) + 1 FROM {0} WHERE AccountLoginServer='{1}'", "SELECT IFNULL(MAX(LoginServerID), 0) + 1 FROM {0} WHERE AccountLoginServer='{1}'",
server.options.GetAccountTable(), server.options.GetAccountTable(),
EscapeString(loginserver) EscapeString(loginserver)
); );
@ -204,7 +204,7 @@ unsigned int Database::GetFreeID(const std::string &loginserver)
auto row = results.begin(); auto row = results.begin();
return atol(row[0]); return std::stoi(row[0]);
} }
/** /**