Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion SecretAPI/Features/Effects/CustomPlayerEffect.cs
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
22 changes: 14 additions & 8 deletions SecretAPI/Features/UserSettings/CustomSetting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -300,20 +300,26 @@ public static void SendSettingsToPlayer(Player player, int? version = null)
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