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

Merge branch 'master' of https://github.com/EQEmu/Server into lsid

Browse Source
This commit is contained in:
Akkadius 2019-09-07 01:03:13 -05:00
commit b8216a5d40
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/scripts/eqemu_server.pl
View File

@ -470,9 +470,19 @@ sub do_installer_routines {
print `"$path" --host $host --user $user --password="$pass" -N -B -e "DROP DATABASE IF EXISTS $db_name;"`; print `"$path" --host $host --user $user --password="$pass" -N -B -e "DROP DATABASE IF EXISTS $db_name;"`;
print `"$path" --host $host --user $user --password="$pass" -N -B -e "CREATE DATABASE $db_name"`; print `"$path" --host $host --user $user --password="$pass" -N -B -e "CREATE DATABASE $db_name"`;
my $world_path = "world";
if (-e "bin/world") {
$world_path = "bin/world";
}
#::: Get Binary DB version #::: Get Binary DB version
if ($OS eq "Windows") { @db_version = split(': ', `world db_version`); } if ($OS eq "Windows") {
if ($OS eq "Linux") { @db_version = split(': ', `./world db_version`); } @db_version = split(': ', `$world_path db_version`);
}
if ($OS eq "Linux") {
@db_version = split(': ', `./$world_path db_version`);
}
$binary_database_version = trim($db_version[1]); $binary_database_version = trim($db_version[1]);
#::: Local DB Version #::: Local DB Version

16
world/net.cpp
View File

@ -444,13 +444,15 @@ int main(int argc, char** argv) {
server_connection->Listen(server_opts); server_connection->Listen(server_opts);
LogInfo("Server (TCP) listener started"); LogInfo("Server (TCP) listener started");
server_connection->OnConnectionIdentified("Zone", [&console](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) { server_connection->OnConnectionIdentified(
LogInfo("New Zone Server connection from [{2}] at [{0}:{1}]", "Zone", [&console](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID()); LogInfo("New Zone Server connection from [{2}] at [{0}:{1}]",
connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
numzones++; numzones++;
zoneserver_list.Add(new ZoneServer(connection, console.get())); zoneserver_list.Add(new ZoneServer(connection, console.get()));
}); }
);
server_connection->OnConnectionRemoved("Zone", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) { server_connection->OnConnectionRemoved("Zone", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
LogInfo("Removed Zone Server connection from [{0}]", LogInfo("Removed Zone Server connection from [{0}]",
@ -498,7 +500,7 @@ int main(int argc, char** argv) {
}); });
server_connection->OnConnectionRemoved("UCS", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) { server_connection->OnConnectionRemoved("UCS", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
LogInfo("Removed Query Server connection from [{0}]", LogInfo("Removed UCS Server connection from [{0}]",
connection->GetUUID()); connection->GetUUID());
UCSLink.SetConnection(nullptr); UCSLink.SetConnection(nullptr);