From 7361c9158b837235aece0d2521c75b4d14e604f4 Mon Sep 17 00:00:00 2001
From: nullptr-w8 <79784082+nullptr-w8@users.noreply.github.com>
Date: Tue, 12 Oct 2021 12:04:40 +0500
Subject: [PATCH] fix: Fixes extracting zstd and deserializing old account
 version (#828)

---
 Projects/UOContent/Accounting/Account.Migrations.cs | 3 ++-
 Projects/UOContent/Compression/ZstdArchive.cs       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Projects/UOContent/Accounting/Account.Migrations.cs b/Projects/UOContent/Accounting/Account.Migrations.cs
index 16b61efa1..dd9148b01 100644
--- a/Projects/UOContent/Accounting/Account.Migrations.cs
+++ b/Projects/UOContent/Accounting/Account.Migrations.cs
@@ -93,7 +93,8 @@ namespace Server.Accounting
 
             _totalGameTime = reader.ReadTimeSpan();
 
-            _email = reader.ReadString();
+            if (version > 1)
+                _email = reader.ReadString();
 
             Timer.StartTimer(AfterDeserialization);
         }
diff --git a/Projects/UOContent/Compression/ZstdArchive.cs b/Projects/UOContent/Compression/ZstdArchive.cs
index 53769f09d..35fd533d5 100755
--- a/Projects/UOContent/Compression/ZstdArchive.cs
+++ b/Projects/UOContent/Compression/ZstdArchive.cs
@@ -23,8 +23,8 @@ namespace Server.Compression
                     {
                         StartInfo = new ProcessStartInfo
                         {
-                            FileName = _pathToZstd,
-                            Arguments = $"-q -d \"{fileNamePath}\" -o \"${tempTarArchive}\""
+                            FileName = Path.Combine(_pathToZstd, "zstd.exe"),
+                            Arguments = $"-q -d \"{fileNamePath}\" -o \"{tempTarArchive}\""
                         }
                     };