From de38440c4f51998e65e4c26190c0029ae3bb3514 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Thu, 5 Sep 2019 19:53:19 -0500
Subject: [PATCH 1/2] Update eqemu_server.pl to use the bin folder if the
 binaries are being ran from them [skip ci]

---
 utils/scripts/eqemu_server.pl | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl
index ef8b0babd..042c3d078 100644
--- a/utils/scripts/eqemu_server.pl
+++ b/utils/scripts/eqemu_server.pl
@@ -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 "CREATE DATABASE $db_name"`;
 
+    my $world_path = "world";
+    if (-e "bin/world") {
+        $world_path = "bin/world";
+    }
+
     #::: Get Binary DB version
-    if ($OS eq "Windows") { @db_version = split(': ', `world db_version`); }
-    if ($OS eq "Linux") { @db_version   = split(': ', `./world db_version`); }
+    if ($OS eq "Windows") {
+        @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]);
 
     #::: Local DB Version

From 1e1b21f2bfffae95e52d18c66f041e3f5fefa5e5 Mon Sep 17 00:00:00 2001
From: JJ <jeremiah.oligario@gmail.com>
Date: Fri, 6 Sep 2019 12:05:51 -0400
Subject: [PATCH 2/2] Fix log during UCS shutdown [skip ci]

---
 world/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/world/net.cpp b/world/net.cpp
index 8278f9437..7ed6f74ac 100644
--- a/world/net.cpp
+++ b/world/net.cpp
@@ -476,7 +476,7 @@ int main(int argc, char** argv) {
 	});
 
 	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());
 
 		UCSLink.SetConnection(nullptr);