From 712df6c35abdec342d9bf7ffcd24aeb7408c57ce Mon Sep 17 00:00:00 2001 From: KimLS Date: Sat, 23 May 2020 23:19:54 -0700 Subject: [PATCH 1/2] Fix compile issue for latest vc compiler --- common/util/uuid.cpp | 1 + common/util/uuid.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/util/uuid.cpp b/common/util/uuid.cpp index 633ffebaf..7acd1517f 100644 --- a/common/util/uuid.cpp +++ b/common/util/uuid.cpp @@ -1,5 +1,6 @@ #include "uuid.h" +#include #include #ifdef _WIN32 diff --git a/common/util/uuid.h b/common/util/uuid.h index 3b37fc2d2..d1e49a0e7 100644 --- a/common/util/uuid.h +++ b/common/util/uuid.h @@ -2,7 +2,7 @@ #include #include -#include +#include namespace EQ { @@ -32,4 +32,4 @@ namespace EQ std::vector m_bytes; }; } -} \ No newline at end of file +} From e8a05ec680c2498a59521456c19f879c5e1a390b Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Sun, 24 May 2020 01:32:50 -0500 Subject: [PATCH 2/2] Fixes instance deletion issue https://github.com/EQEmu/Server/issues/1069 --- common/database_instances.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/database_instances.cpp b/common/database_instances.cpp index 617a2baf6..945fca078 100644 --- a/common/database_instances.cpp +++ b/common/database_instances.cpp @@ -514,8 +514,10 @@ void Database::BuryCorpsesInInstance(uint16 instance_id) { void Database::DeleteInstance(uint16 instance_id) { - std::string query; + + query = StringFormat("DELETE FROM instance_list WHERE id=%u", instance_id); + QueryDatabase(query) query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id); QueryDatabase(query);