diff --git a/.gitignore b/.gitignore index d161c97c1..51f630e71 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,5 @@ logs/ protobuf/csharp/* protobuf/go/* protobuf/java/* -protobuf/python/* \ No newline at end of file +protobuf/python/* +.vscode \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index e6d175277..0194de7f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,7 @@ IF(MSVC) ELSE(MSVC) SET(NATS_LIBRARY "${NATS_ROOT}/lib_x64/libnats.so") - SET(PROTOBUF_LIBRARY "${PROTOBUF_ROOT}/lib_x64/libprotobuf.so") + SET(PROTOBUF_LIBRARY "${PROTOBUF_ROOT}/lib_x64/libprotobuf.so.15") #Normally set by perl but we don't use the perl flags anymore so we set it. ADD_DEFINITIONS(-DHAS_UNION_SEMUN) diff --git a/world/cliententry.cpp b/world/cliententry.cpp index be8916676..9760935a0 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -25,10 +25,12 @@ #include "world_config.h" #include "../common/guilds.h" #include "../common/string_util.h" +#include "nats_manager.h" extern uint32 numplayers; extern LoginServerList loginserverlist; extern ClientList client_list; +extern NatsManager nats; extern volatile bool RunLoops; ClientListEntry::ClientListEntry(uint32 in_id, uint32 iLSID, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin, uint32 ip, uint8 local) @@ -286,6 +288,7 @@ bool ClientListEntry::CheckAuth(uint32 iLSID, const char* iKey) { Log(Logs::Detail, Logs::World_Server,"Error adding local account for LS login: '%s', duplicate name?" ,plsname); return false; } + nats.SendAdminMessage(StringFormat("New account was created for %s, accountid: %u", plsname, paccountid)); strn0cpy(paccountname, plsname, sizeof(paccountname)); padmin = tmpStatus; } diff --git a/zone/nats_manager.h b/zone/nats_manager.h index b9159ffca..ab80e94af 100644 --- a/zone/nats_manager.h +++ b/zone/nats_manager.h @@ -2,8 +2,8 @@ #define _NATS_H #include "nats.h" #include "event_codes.h" -#include "entity.h"; -#include "mob.h"; +#include "entity.h" +#include "mob.h" #include "../common/opcodemgr.h" #include "../common/global_define.h"