resolve conflicts

Author: skyfr0676

.idea/.idea.SSMenuSystem/.idea/.gitignore

@@ -1,14 +1,13 @@
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Exiled.Events.EventArgs.Player;
-using MEC;
 using PluginAPI.Core;
 using SSMenuSystem.Features;
 using SSMenuSystem.Features.Wrappers;
 using UserSettings.ServerSpecific;
+using MEC;
 #if EXILED
+using Exiled.Events.EventArgs.Player;
 #elif NWAPI
 using PluginAPI.Core.Attributes;
 using PluginAPI.Enums;

.idea/.idea.SSMenuSystem/.idea/discord.xml

@@ -346,6 +346,18 @@ private List<ServerSpecificSettingBase> GetSettings(ReferenceHub hub, bool isDef
                 return settings;
             }
 
+            ServerSpecificSettingBase[] oSettings = GetSettingsFor(hub);
+            if (oSettings != null && !oSettings.IsEmpty())
+            {
+                foreach (ServerSpecificSettingBase t in oSettings)
+                {
+                    if (t is ISetting setting)
+                        settings.Add(setting.Base);
+                    else
+                        settings.Add(t);
+                }
+            }
+
             foreach (ServerSpecificSettingBase t in Settings)
             {
                 if (t is ISetting setting)
@@ -541,5 +553,15 @@ public static void RegisterPin(SSTextArea[] toPin) =>
         /// Called when the <see cref="Menu"/> is registered.
         /// </summary>
         protected virtual void OnRegistered(){}
+
+        /// <summary>
+        /// Get settings for the specific <see cref="ReferenceHub"/>
+        /// <param name="hub">The target <see cref="ReferenceHub"/>.</param>
+        /// <returns>A list of <see cref="ServerSpecificSettingBase"/> that will be sent into the player (like <see cref="Settings"/> but only for the <see cref="ReferenceHub"/>)</returns>
+        /// </summary>
+        public virtual ServerSpecificSettingBase[] GetSettingsFor(ReferenceHub hub)
+        {
+            return null;
+        }
     }
 }

.idea/.idea.SSMenuSystem/.idea/encodings.xml

@@ -1,9 +1,9 @@
-using System;
-using Exiled.API.Features;
 using HarmonyLib;
 using SSMenuSystem.Features;
 using UserSettings.ServerSpecific;
 #if EXILED
+using System;
+using Exiled.API.Features;
 #elif NWAPI
 using PluginAPI.Core;
 #endif
@@ -34,10 +34,11 @@ public class Plugin
         /// <summary>
         /// Gets the version of the plugin.
         /// </summary>
-        public override Version Version => new(2, 0, 3);
-        
+        public override Version Version => new(2, 0, 4);
+
         /// <inheritdoc/>
-        public override Version RequiredExiledVersion => new(4, 0, 0);
+        public override Version RequiredExiledVersion => new(9, 5, 0);
+
         /// <summary>
         /// Gets the prefix used for configs.
         /// </summary>
@@ -100,7 +101,7 @@ public override void OnDisabled()
         /// <summary>
         /// Declared when plugin is started.
         /// </summary>
-        [PluginAPI.Core.Attributes.PluginEntryPoint("SSMenuSystem", "2.0.3", "sync all plugins to one server specific with menus.", "sky")]
+        [PluginAPI.Core.Attributes.PluginEntryPoint("SSMenuSystem", "2.0.4", "sync all plugins to one server specific with menus.", "sky")]
         public void OnEnabled()
         {
             if (Config == null)

.idea/.idea.SSMenuSystem/.idea/indexLayout.xml

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.3")]
+[assembly: AssemblyVersion("2.0.4")]
 [assembly: AssemblyFileVersion("1.0.0.0")]