From 020ad2f834dde26cb5739d0944af0b6af55c5ec0 Mon Sep 17 00:00:00 2001 From: Jabak <163307958+Jabaks@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:32:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=B0=D0=BA=20=D0=B6=D0=B5=20=D1=8F=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B5=D0=B1=D0=B0=D0=BB=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tests/Preferences/ServerDbSqliteTests.cs | 11 +++++++---- Content.Server/Database/ServerDbBase.cs | 4 ++-- .../Preferences/HumanoidCharacterProfile.cs | 7 ++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs index a7310f1f5a..3a3ad81059 100644 --- a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs +++ b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs @@ -4,6 +4,7 @@ using Content.Server.Database; using Content.Shared._Amour.RoleplayInfo; using Content.Shared.GameTicking; using Content.Shared.Humanoid; +using Content.Shared.Humanoid.Markings; using Content.Shared.Preferences; using Content.Shared.Preferences.Loadouts; using Content.Shared.Preferences.Loadouts.Effects; @@ -59,8 +60,10 @@ namespace Content.IntegrationTests.Tests.Preferences "Shaved", Color.Aquamarine, Color.Azure, - Color.Beige,128, - new (), new() //AMOUR + Color.Beige, + 128, + new (), + new() //AMOUR ), SpawnPriorityPreference.None, new Dictionary @@ -70,8 +73,8 @@ namespace Content.IntegrationTests.Tests.Preferences PreferenceUnavailableMode.StayInLobby, new List (), new List(), - new Dictionary(), - new Dictionary() //AMOUR + new Dictionary(), //AMOUR + new Dictionary() ); } diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs index 187b1c56ff..895f3ddf75 100644 --- a/Content.Server/Database/ServerDbBase.cs +++ b/Content.Server/Database/ServerDbBase.cs @@ -282,8 +282,8 @@ namespace Content.Server.Database (PreferenceUnavailableMode) profile.PreferenceUnavailable, antags.ToList(), traits.ToList(), - loadouts, - roleplayInfo + roleplayInfo, + loadouts ); } diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 4b68e52ab3..da37f52918 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -139,7 +139,8 @@ namespace Content.Shared.Preferences PreferenceUnavailableMode preferenceUnavailable, IReadOnlyList antagPreferences, IReadOnlyList traitPreferences, - Dictionary loadouts, IReadOnlyDictionary roleplayInfoData) + IReadOnlyDictionary roleplayInfoData, + Dictionary loadouts) : this(name, clownName, mimeName, @@ -157,8 +158,8 @@ namespace Content.Shared.Preferences preferenceUnavailable, new List(antagPreferences), new List(traitPreferences), - new Dictionary(loadouts), - new Dictionary(roleplayInfoData)) + new Dictionary(roleplayInfoData), + new Dictionary(loadouts)) { }