Merge branch 'dev' into main

Triky313 · Mar 24, 2023 · bd3ba27 · bd3ba27
2 parents 2142ba3 + 40b9aa5
commit bd3ba27
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/src/StatisticsAnalysisTool/Languages/pl-PL.xml b/src/StatisticsAnalysisTool/Languages/pl-PL.xml
@@ -700,4 +700,10 @@
 	<translation name="RESOURCE_VALUE">Całkowita cena zebranych surowców</translation>
 	<translation name="TOTAL_MARKET_VALUE">Cena zebranego surowca</translation>
 	<translation name="NAVIGATION_TAB_VISIBILITY">Dostosowanie zakładek</translation>
+	<translation name="SERVER">Serwer</translation>
+	<translation name="UNKNOWN_SERVER">Nieznany serwer</translation>
+	<translation name="WEST_SERVER">Serwer Zachodni</translation>
+	<translation name="EAST_SERVER">Serwer Wschodni</translation>
+	<translation name="ALBION_DATA_PROJECT_BASE_URL_WEST">Baza danych projektu Albion URL Zachód</translation>
+	<translation name="ALBION_DATA_PROJECT_BASE_URL_EAST">Baza danych projektu Albion URL Wschód</translation>
 </translations>
diff --git a/src/StatisticsAnalysisTool/Languages/ru-RU.xml b/src/StatisticsAnalysisTool/Languages/ru-RU.xml
@@ -588,6 +588,7 @@
 	<translation name="RANDOM_SOLO_DUNGEONS">Рандомные сольники</translation>
 	<translation name="RANDOM_GROUP_DUNGEONS">Рандомные групповые данжи</translation>
 	<translation name="SNAPSHOT_AFTER_MAP_CHANGE">Скриншот после смены локации</translation>
+	<translation name="IGNORE_MAILS_WITH_ZERO_VALUES">Игнорировать пустые сообщения</translation>
 	<translation name="CHECK_FOR_UPDATE">Проверить обновления</translation>
 	<translation name="PAID_SILVER_FOR_RESPEC_THIS_SESSION">Потрачено серебра на выкачку за сеанс</translation>
 	<translation name="PAID_SILVER_FOR_RESPEC_PER_HOUR">Потрачено серебра на выкачку за час</translation>
@@ -665,4 +666,13 @@
 	<translation name="AMOUNT_OF_MINING_PROCESSES">Количество вскапываний</translation>
 	<translation name="SURE_YOU_WANT_TO_DELETE_SELECTED_RESOURCES">Вы уверены, что хотите удалить выбранные записи?</translation>
 	<translation name="DELETE_SELECTED_RESOURCES">Удалить выбранные записи</translation>
+	<translation name="RESOURCE_VALUE">Количество ресурса</translation>
+	<translation name="TOTAL_MARKET_VALUE">Рыночная цена</translation>
+	<translation name="NAVIGATION_TAB_VISIBILITY">Видимость вкладок</translation>
+	<translation name="SERVER">Сервер</translation>
+	<translation name="UNKNOWN_SERVER">Неизвестный сервер</translation>
+	<translation name="WEST_SERVER">West</translation>
+	<translation name="EAST_SERVER">East</translation>
+	<translation name="ALBION_DATA_PROJECT_BASE_URL_WEST">Ссылка на Albion data project WEST</translation>
+	<translation name="ALBION_DATA_PROJECT_BASE_URL_EAST">Ссылка на Albion data project EAST</translation>
 </translations>
diff --git a/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs b/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs
@@ -1,10 +1,10 @@
 using log4net;
 using StatisticsAnalysisTool.Common;
+using StatisticsAnalysisTool.Trade.Mails;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using StatisticsAnalysisTool.Trade.Mails;
 
 namespace StatisticsAnalysisTool.Network.Operations.Responses;
 
@@ -27,13 +27,25 @@ public GetMailInfosResponse(Dictionary<byte, object> parameters)
                 !parameters.ContainsKey(6) || parameters[6] == null ||
                 !parameters.ContainsKey(10) || parameters[10] == null ||
                 !parameters[3].GetType().IsArray ||
-                typeof(long[]).Name != parameters[3].GetType().Name)
+                (typeof(long[]).Name != parameters[3].GetType().Name &&
+                 typeof(int[]).Name != parameters[3].GetType().Name))
             {
                 return;
             }
 
             var guid = parameters[0].ObjectToGuid();
-            var mailIdArray = ((long[]) parameters[3]).ToArray();
+
+            long[] mailIdArray = { };
+
+            // If the mails ID's are ever below 32.767, an error will appear here, but this should not happen on the current west and east servers, since the mail ID is above it and can never come below it again.
+            if (typeof(int[]).Name == parameters[3].GetType().Name)
+            {
+                mailIdArray = Array.ConvertAll((int[]) parameters[3], x => (long) x);
+            }
+            else if (typeof(long[]).Name == parameters[3].GetType().Name)
+            {
+                mailIdArray = ((long[]) parameters[3]).ToArray();
+            }
 
             if (mailIdArray is not { Length: > 0 })
             {

diff --git a/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
@@ -53,5 +53,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.18.0.*")]
-[assembly: AssemblyFileVersion("5.18.0.0")]
+[assembly: AssemblyVersion("5.18.1.*")]
+[assembly: AssemblyFileVersion("5.18.1.0")]