From 1ddde331752a7870ed76c33ad755015a0792c7d4 Mon Sep 17 00:00:00 2001 From: Marcin Wieczorek <115917138+arabinos@users.noreply.github.com> Date: Wed, 22 Mar 2023 16:53:52 +0100 Subject: [PATCH 1/5] Update pl-PL.xml --- src/StatisticsAnalysisTool/Languages/pl-PL.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/StatisticsAnalysisTool/Languages/pl-PL.xml b/src/StatisticsAnalysisTool/Languages/pl-PL.xml index 6aa76abf8..93f23d042 100644 --- a/src/StatisticsAnalysisTool/Languages/pl-PL.xml +++ b/src/StatisticsAnalysisTool/Languages/pl-PL.xml @@ -700,4 +700,10 @@ Całkowita cena zebranych surowców Cena zebranego surowca Dostosowanie zakładek + Serwer + Nieznany serwer + Serwer Zachodni + Serwer Wschodni + Baza danych projektu Albion URL Zachód + Baza danych projektu Albion URL Wschód From e6ba17591be27df7a6a2087d35a56e9988107874 Mon Sep 17 00:00:00 2001 From: PurpleGale <90148755+PurpleGale@users.noreply.github.com> Date: Fri, 24 Mar 2023 02:14:26 +0300 Subject: [PATCH 2/5] Update ru-RU.xml --- src/StatisticsAnalysisTool/Languages/ru-RU.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/StatisticsAnalysisTool/Languages/ru-RU.xml b/src/StatisticsAnalysisTool/Languages/ru-RU.xml index 119c6b8bc..91691c5a3 100644 --- a/src/StatisticsAnalysisTool/Languages/ru-RU.xml +++ b/src/StatisticsAnalysisTool/Languages/ru-RU.xml @@ -588,6 +588,7 @@ Рандомные сольники Рандомные групповые данжи Скриншот после смены локации + Игнорировать пустые сообщения Проверить обновления Потрачено серебра на выкачку за сеанс Потрачено серебра на выкачку за час @@ -665,4 +666,13 @@ Количество вскапываний Вы уверены, что хотите удалить выбранные записи? Удалить выбранные записи + Количество ресурса + Рыночная цена + Видимость вкладок + Сервер + Неизвестный сервер + West + East + Ссылка на Albion data project WEST + Ссылка на Albion data project EAST From 66bcfac6e3167531fa880e662dcdb3d6fd6eaf85 Mon Sep 17 00:00:00 2001 From: Aaron Date: Fri, 24 Mar 2023 09:12:14 +0100 Subject: [PATCH 3/5] Fixed a bug when reading mails --- .../Responses/GetMailInfosResponse.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs b/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs index 441823621..8a5c808cf 100644 --- a/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs +++ b/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs @@ -2,6 +2,7 @@ using StatisticsAnalysisTool.Common; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Reflection; using StatisticsAnalysisTool.Trade.Mails; @@ -27,13 +28,24 @@ public GetMailInfosResponse(Dictionary 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 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 }) { From df4f86d02f02f2c1ed3d3700e7565dc5a50140e8 Mon Sep 17 00:00:00 2001 From: Aaron Date: Fri, 24 Mar 2023 09:13:03 +0100 Subject: [PATCH 4/5] Change comment text --- .../Network/Operations/Responses/GetMailInfosResponse.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs b/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs index 8a5c808cf..6681ed299 100644 --- a/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs +++ b/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs @@ -37,7 +37,8 @@ public GetMailInfosResponse(Dictionary parameters) var guid = parameters[0].ObjectToGuid(); long[] mailIdArray = {}; - // If the mails 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 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); From 40b9aa54c5a85b16b88129dfe3cdabff92bbd020 Mon Sep 17 00:00:00 2001 From: Aaron Date: Fri, 24 Mar 2023 09:20:07 +0100 Subject: [PATCH 5/5] Version increased --- .../Network/Operations/Responses/GetMailInfosResponse.cs | 9 ++++----- src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs b/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs index 6681ed299..f33096afd 100644 --- a/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs +++ b/src/StatisticsAnalysisTool/Network/Operations/Responses/GetMailInfosResponse.cs @@ -1,11 +1,10 @@ using log4net; using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Trade.Mails; using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Reflection; -using StatisticsAnalysisTool.Trade.Mails; namespace StatisticsAnalysisTool.Network.Operations.Responses; @@ -33,16 +32,16 @@ public GetMailInfosResponse(Dictionary parameters) { return; } - + var guid = parameters[0].ObjectToGuid(); - long[] mailIdArray = {}; + 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(); diff --git a/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs index 10a16243b..dd28099f4 100644 --- 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.17.5.*")] -[assembly: AssemblyFileVersion("5.17.5.0")] \ No newline at end of file +[assembly: AssemblyVersion("5.18.1.*")] +[assembly: AssemblyFileVersion("5.18.1.0")] \ No newline at end of file