Skip to content

Release #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
obvEve merged 6 commits into from
Apr 29, 2026
Merged

Release #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bbfaa93
Optimize: Avoid GroupBy when unnessary
obvEve Apr 28, 2026
8d986a3
optimize: Remove unncessary harmony patch
obvEve Apr 29, 2026
cceebc3
fix: IsCurrentlyAccessible being set before PersonalizeSetting()
obvEve Apr 29, 2026
de16f43
Merge pull request #96 from obvEve/optimize
obvEve Apr 29, 2026
18abc58
Bump: Version
obvEve Apr 29, 2026
5fc43e9
Swap to .slnx
obvEve Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<Version>3.1.1</Version>
<Version>3.1.2</Version>
</PropertyGroup>

<PropertyGroup Label="Nuget">
Expand All @@ -22,4 +22,4 @@
<CodeAnalysisRuleSet>../stylecop.ruleset</CodeAnalysisRuleSet>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
</Project>
</Project>
22 changes: 0 additions & 22 deletions SecretAPI.sln
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions SecretAPI.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<Solution>
<Project Path="SecretAPI.Examples/SecretAPI.Examples.csproj" />
<Project Path="SecretAPI/SecretAPI.csproj" />
</Solution>
1 change: 0 additions & 1 deletion SecretAPI/Features/Effects/CustomPlayerEffect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public abstract class CustomPlayerEffect : StatusEffectBase
[CallOnLoad]
internal static void Initialize()
{
SecretApi.Harmony.PatchCategory(nameof(CustomPlayerEffect), SecretApi.Assembly);
EffectsToRegister.Add(typeof(Energized));
EffectsToRegister.Add(typeof(Depleted));

Expand Down
24 changes: 15 additions & 9 deletions SecretAPI/Features/UserSettings/CustomSetting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,25 +295,31 @@ public static void SendSettingsToPlayer(Player player, int? version = null)
}

CustomSetting playerSpecific = EnsurePlayerSpecificSetting(player, setting);
setting.IsCurrentlyAccessible = true;
playerSpecific.PersonalizeSetting();
setting.IsCurrentlyAccessible = true;
playerSettings.Add(playerSpecific);
}

List<ServerSpecificSettingBase> ordered = ListPool<ServerSpecificSettingBase>.Shared.Rent();
foreach (IGrouping<CustomHeader, CustomSetting> grouping in playerSettings.GroupBy(static setting => setting.Header))
if (playerSettings.Count != 0)
{
ordered.Add(grouping.Key.Base);
ordered.AddRange(grouping.Select(static setting => setting.Base));
}
List<ServerSpecificSettingBase> ordered = ListPool<ServerSpecificSettingBase>.Shared.Rent();
foreach (IGrouping<CustomHeader, CustomSetting> grouping in playerSettings.GroupBy(static setting => setting.Header))
{
ordered.Add(grouping.Key.Base);
ordered.AddRange(grouping.Select(static setting => setting.Base));
}

if (ServerSpecificSettingsSync.DefinedSettings != null)
ordered.AddRange(ServerSpecificSettingsSync.DefinedSettings);

ServerSpecificSettingsSync.SendToPlayer(player.ReferenceHub, ordered.ToArray(), version);
ServerSpecificSettingsSync.SendToPlayer(player.ReferenceHub, ordered.ToArray(), version);
ListPool<ServerSpecificSettingBase>.Shared.Return(ordered);
}
else
{
ServerSpecificSettingsSync.SendToPlayer(player.ReferenceHub, ServerSpecificSettingsSync.DefinedSettings, version);
}

ListPool<CustomSetting>.Shared.Return(playerSettings);
ListPool<ServerSpecificSettingBase>.Shared.Return(ordered);
}

/// <summary>
Expand Down
Loading