From 7cc23fcbebd438e3fcd246aa70d9fe6ee37d855c Mon Sep 17 00:00:00 2001
From: Paul Coene <pcoene1@twc.com>
Date: Wed, 19 Aug 2020 14:48:28 -0400
Subject: [PATCH 1/3] Removed duplicate code for pruning merhantlist_temp

The code already exists, guarded by a rule.
---
 world/main.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/world/main.cpp b/world/main.cpp
index 49e02859f..0ec3ae0bf 100644
--- a/world/main.cpp
+++ b/world/main.cpp
@@ -327,9 +327,6 @@ int main(int argc, char** argv) {
 		}
 	}
 
-	LogInfo("Purging expired data buckets");
-	database.PurgeAllDeletedDataBuckets();
-
 	LogInfo("Loading zones");
 
 	world_store.LoadZones();

From b8586bf9cb0b8d53103525ffd1272e3aed4f193d Mon Sep 17 00:00:00 2001
From: Paul Coene <pcoene1@twc.com>
Date: Wed, 19 Aug 2020 14:57:21 -0400
Subject: [PATCH 2/3] Update main.cpp

---
 world/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/world/main.cpp b/world/main.cpp
index 0ec3ae0bf..03ec9fbee 100644
--- a/world/main.cpp
+++ b/world/main.cpp
@@ -326,7 +326,10 @@ int main(int argc, char** argv) {
 			LogInfo("Current hotfix in use: [{}]", hotfix_name.c_str());
 		}
 	}
-
+	
+	LogInfo("Purging expired data buckets");
+	database.PurgeAllDeletedDataBuckets();
+	
 	LogInfo("Loading zones");
 
 	world_store.LoadZones();
@@ -341,9 +344,6 @@ int main(int argc, char** argv) {
 	database.ClearInvSnapshots();
 	LogInfo("Loading items");
 
-	LogInfo("Purging player sold merchant items");
-	MerchantlistTempRepository::Truncate();
-
 	if (!content_db.LoadItems(hotfix_name)) {
 		LogError("Error: Could not load item data. But ignoring");
 	}

From 9be5ac4ca641461dd25e1117bfa8b2e7ac70393d Mon Sep 17 00:00:00 2001
From: Paul Coene <pcoene1@twc.com>
Date: Wed, 19 Aug 2020 14:58:04 -0400
Subject: [PATCH 3/3] Update main.cpp

---
 world/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/world/main.cpp b/world/main.cpp
index 03ec9fbee..b94ecea4c 100644
--- a/world/main.cpp
+++ b/world/main.cpp
@@ -326,10 +326,10 @@ int main(int argc, char** argv) {
 			LogInfo("Current hotfix in use: [{}]", hotfix_name.c_str());
 		}
 	}
-	
+
 	LogInfo("Purging expired data buckets");
 	database.PurgeAllDeletedDataBuckets();
-	
+
 	LogInfo("Loading zones");
 
 	world_store.LoadZones();