Merge branch 'master' into feature/eqemu-api-data-service-netstats-ws

This commit is contained in:
Akkadius
2019-06-23 22:51:21 +00:00
35 changed files with 431 additions and 99 deletions
+6 -1
View File
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "../common/eqemu_logsys_fmt.h"
#include "../common/misc_functions.h"
#include "ucsconfig.h"
#include "clientlist.h"
#include "database.h"
#include "chatchannel.h"
@@ -466,6 +467,7 @@ static void ProcessCommandIgnore(Client *c, std::string Ignoree) {
safe_delete(outapp);
}
Clientlist::Clientlist(int ChatPort) {
EQStreamManagerInterfaceOptions chat_opts(ChatPort, false, false);
chat_opts.opcode_size = 1;
@@ -479,7 +481,10 @@ Clientlist::Clientlist(int ChatPort) {
ChatOpMgr = new RegularOpcodeManager;
if (!ChatOpMgr->LoadOpcodes("mail_opcodes.conf"))
const ucsconfig *Config = ucsconfig::get();
Log(Logs::General, Logs::UCS_Server, "Loading '%s'", Config->MailOpCodesFile.c_str());
if (!ChatOpMgr->LoadOpcodes(Config->MailOpCodesFile.c_str()))
exit(1);
chatsf->OnNewConnection([this](std::shared_ptr<EQ::Net::EQStream> stream) {