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

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

Browse Source
This commit is contained in:
Uleat 2019-09-06 20:52:23 -04:00
commit a428eb61a1
2 changed files with 13 additions and 3 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

2
world/net.cpp
View File

@ -490,7 +490,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) {
LogF(Logs::General, Logs::World_Server, "Removed Query Server connection from {0}", LogF(Logs::General, Logs::World_Server, "Removed UCS Server connection from {0}",
connection->GetUUID()); connection->GetUUID());
UCSLink.SetConnection(nullptr); UCSLink.SetConnection(nullptr);