pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Akkadius
2019-07-03 01:40:36 -05:00
parent 4e7bcd86ff
commit ea02042ace
5 changed files with 268 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/api_service.cpp
+20 -3
View File
@@ -34,13 +34,25 @@
extern Zone *zone;
EQ::Net::WebsocketLoginStatus
CheckLogin(EQ::Net::WebsocketServerConnection *connection, const std::string &username, const std::string &password)
/**
* @param connection
* @param username
* @param password
* @return
*/
EQ::Net::WebsocketLoginStatus CheckLogin(
EQ::Net::WebsocketServerConnection *connection,
const std::string &username,
const std::string &password
)
{
EQ::Net::WebsocketLoginStatus ret;
ret.logged_in = false;
ret.account_id = database.CheckLogin(username.c_str(), password.c_str());
std::string prefix = "eqemu";
ret.account_id = database.CheckLogin(username.c_str(), password.c_str(), prefix.c_str());
if (ret.account_id == 0) {
return ret;
@@ -54,6 +66,11 @@ CheckLogin(EQ::Net::WebsocketServerConnection *connection, const std::string &us
return ret;
}
/**
* @param connection
* @param params
* @return
*/
Json::Value ApiGetPacketStatistics(EQ::Net::WebsocketServerConnection *connection, Json::Value params)
{
if (zone->GetZoneID() == 0) {