Skip to content
Open
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
37 changes: 35 additions & 2 deletions SecretAPI/Features/UserSettings/CustomSetting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using global::UserSettings.ServerSpecific;
using LabApi.Events.Handlers;
using LabApi.Features.Console;
using LabApi.Features.Enums;
using LabApi.Features.Wrappers;
using Mirror;
Expand Down Expand Up @@ -155,13 +157,22 @@ public bool IsShared
/// Registers a collection of settings.
/// </summary>
/// <param name="settings">The settings to register.</param>
public static void Register(params CustomSetting[] settings) => CustomSettings.AddRange(settings);
public static void Register(params CustomSetting[] settings)
{
settings.ForEach(setting => ReportSettingIssue(setting, null));
CustomSettings.AddRange(settings);
}

/// <summary>
/// Registers a collection of settings.
/// </summary>
/// <param name="settings">The settings to register.</param>
public static void Register(IEnumerable<CustomSetting> settings) => CustomSettings.AddRange(settings);
public static void Register(IEnumerable<CustomSetting> settings)
{
foreach (CustomSetting? setting in settings)
ReportSettingIssue(setting, null);
CustomSettings.AddRange(settings);
}

/// <summary>
/// Unregisters collection of settings.
Expand Down Expand Up @@ -322,6 +333,28 @@ public static void SendSettingsToPlayer(Player player, int? version = null)
ListPool<CustomSetting>.Shared.Return(playerSettings);
}

/// <summary>
/// Reports issues with settings being registered.
/// </summary>
/// <param name="setting">The <see cref="CustomSetting"/> to validate.</param>
/// <param name="settingBase">The <see cref="ServerSpecificSettingBase"/> to validate.</param>
internal static void ReportSettingIssue(CustomSetting? setting, ServerSpecificSettingBase? settingBase)
{
if (settingBase == null && setting == null)
{
Logger.Error("[CustomSetting.TryValidateSetting] Failed to validate null setting! " + new StackTrace());
return;
}

int id = setting?.Id ?? settingBase!.SettingId;
string? sharedIdInfo = CustomSettings.FirstOrDefault(s => s.Id == id)?.GetType().FullName ?? ServerSpecificSettingsSync.DefinedSettings.FirstOrDefault(s => s.SettingId == id)?.Label;
if (sharedIdInfo != null)
{
Logger.Error($"[CustomSetting.TryValidateSetting] {setting?.GetType().FullName ?? settingBase?.Label ?? "UNKNOWN"} is being registered with a duplicate ID ({id}) shared by {sharedIdInfo} {new StackTrace()}");
return;
}
}

/// <summary>
/// Checks whether a <see cref="ReferenceHub"/> is equal to <see cref="KnownOwner"/>.
/// </summary>
Expand Down
19 changes: 19 additions & 0 deletions SecretAPI/Patches/Features/ReportDefinedSettingPatch.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
namespace SecretAPI.Patches.Features;

using HarmonyLib;
using SecretAPI.Attributes;
using SecretAPI.Features.UserSettings;
using UserSettings.ServerSpecific;

/// <summary>
/// Logs issues with <see cref="ServerSpecificSettingsSync.DefinedSettings"/>.
/// </summary>
[HarmonyPatchCategory(nameof(CustomSetting))]
[HarmonyPatch(typeof(ServerSpecificSettingsSync), nameof(ServerSpecificSettingsSync.DefinedSettings), MethodType.Setter)]
internal static class ReportDefinedSettingPatch
{
private static void Postfix(ref ServerSpecificSettingBase[] value)
{
value.ForEach(setting => CustomSetting.ReportSettingIssue(null, setting));
}
}
Loading